Compare commits

..

13 Commits

Author SHA1 Message Date
80ce759b1d init for thinkpad 2026-02-26 20:29:56 +01:00
406609f990 merge 2026-02-26 14:27:35 +01:00
325cc17e1b trele morele 2026-02-26 13:52:30 +01:00
dc8a82364b dxdxd 2026-02-26 13:39:32 +01:00
04f6dab540 Merge remote-tracking branch 'origin/master' into laptop 2026-02-25 15:17:54 +01:00
02a5295aef change ssh key 2026-02-25 15:16:08 +01:00
12ead5ae9b merge 2026-02-25 15:07:46 +01:00
06deba1909 flake 2026-02-25 01:16:54 +01:00
a1952fa7a9 test 2026-02-25 00:24:43 +01:00
cd8ef7e5db comituje 2026-02-24 23:39:07 +01:00
1801311cb5 laptop
Merge branch 'master' of https://github.com/szymon-jozef/amazing-dotfiles
2026-02-23 13:51:43 +01:00
c16e047e32 comituje 2026-02-23 13:51:37 +01:00
2b8f7383ad comituje 2026-02-23 13:51:11 +01:00
26 changed files with 218 additions and 598 deletions

383
flake.lock generated
View File

@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1773436376,
"narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=",
"lastModified": 1771610171,
"narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8",
"rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
"type": "github"
},
"original": {
@@ -38,11 +38,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1774098279,
"narHash": "sha256-OoQRoQmwCuBBXObi82F6C+eYV1lYCt5Va5k/VckJ6vo=",
"lastModified": 1771587924,
"narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
"owner": "catppuccin",
"repo": "nix",
"rev": "cb374516af3ccc3aa0c6ef518292bf4ae417a60e",
"rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
"type": "github"
},
"original": {
@@ -88,24 +88,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@@ -135,11 +117,11 @@
]
},
"locked": {
"lastModified": 1774210133,
"narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=",
"lastModified": 1772060133,
"narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95",
"rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4",
"type": "github"
},
"original": {
@@ -164,11 +146,11 @@
]
},
"locked": {
"lastModified": 1772461003,
"narHash": "sha256-pVICsV7FtcEeVwg5y/LFh3XFUkVJninm/P1j/JHzEbM=",
"lastModified": 1753964049,
"narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "b62396457b9cfe2ebf24fe05404b09d2a40f8ed7",
"rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
"type": "github"
},
"original": {
@@ -177,24 +159,6 @@
"type": "github"
}
},
"hyprcursor-phinger": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1763845612,
"narHash": "sha256-78zH5GrYa35bEkzeVnl8uXFbZ/zsiSHayjxZlNt+Xe8=",
"owner": "jappie3",
"repo": "hyprcursor-phinger",
"rev": "1207a845501a28e0e00d4a8e935ee0c9cab30650",
"type": "github"
},
"original": {
"owner": "jappie3",
"repo": "hyprcursor-phinger",
"type": "github"
}
},
"hyprgraphics": {
"inputs": {
"hyprutils": [
@@ -211,11 +175,11 @@
]
},
"locked": {
"lastModified": 1772461523,
"narHash": "sha256-mI6A51do+hEUzeJKk9YSWfVHdI/SEEIBi2tp5Whq5mI=",
"lastModified": 1770511807,
"narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "7d63c04b4a2dd5e59ef943b4b143f46e713df804",
"rev": "7c75487edd43a71b61adb01cae8326d277aab683",
"type": "github"
},
"original": {
@@ -235,17 +199,17 @@
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1774136452,
"narHash": "sha256-pSwj8WNWXMuZaDqCyhQwlngRD3JyNmZwldSe6UqWAos=",
"lastModified": 1772107319,
"narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "bf31f642b08a8d8ca796a1b713285f2580805c2f",
"rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309",
"type": "github"
},
"original": {
@@ -287,11 +251,11 @@
]
},
"locked": {
"lastModified": 1772467975,
"narHash": "sha256-kipyuDBxrZq+beYpZqWzGvFWm4QbayW9agAvi94vDXY=",
"lastModified": 1767023960,
"narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"rev": "5e1c6b9025aaf4d578f3eff7c0eb1f0c197a9507",
"rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
"type": "github"
},
"original": {
@@ -312,11 +276,11 @@
]
},
"locked": {
"lastModified": 1772460177,
"narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
"lastModified": 1765214753,
"narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
"rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
"type": "github"
},
"original": {
@@ -341,11 +305,11 @@
]
},
"locked": {
"lastModified": 1772459629,
"narHash": "sha256-/iwvNUYShmmnwmz/czEUh6+0eF5vCMv0xtDW0STPIuM=",
"lastModified": 1771866172,
"narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "7615ee388de18239a4ab1400946f3d0e498a8186",
"rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
"type": "github"
},
"original": {
@@ -393,11 +357,11 @@
]
},
"locked": {
"lastModified": 1772462885,
"narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
"lastModified": 1764592794,
"narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
"rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
"rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
"type": "github"
},
"original": {
@@ -418,11 +382,11 @@
]
},
"locked": {
"lastModified": 1773948364,
"narHash": "sha256-S76omfIVQ1TpGiXFbqih6o6XcH3sA5+5QI+SXB4HvlY=",
"lastModified": 1771271487,
"narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "b85b779e3e3a1adcd9b098e3447cf48f9e780b35",
"rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
"type": "github"
},
"original": {
@@ -443,11 +407,11 @@
]
},
"locked": {
"lastModified": 1772459835,
"narHash": "sha256-978jRz/y/9TKmZb/qD4lEYHCQGHpEXGqy+8X2lFZsak=",
"lastModified": 1770501770,
"narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "0a692d4a645165eebd65f109146b8861e3a925e7",
"rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
"type": "github"
},
"original": {
@@ -472,11 +436,11 @@
]
},
"locked": {
"lastModified": 1773074819,
"narHash": "sha256-qRqYnXiKoJLRTcfaRukn7EifmST2IVBUMZOeZMAc5UA=",
"lastModified": 1771606233,
"narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
"owner": "hyprwm",
"repo": "hyprwire",
"rev": "f68afd0e73687598cc2774804fedad76693046f0",
"rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
"type": "github"
},
"original": {
@@ -486,86 +450,6 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1773821835,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1762977756,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1773389992,
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1773821835,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1772198003,
"narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
@@ -581,6 +465,38 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1771848320,
"narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": {
"inputs": {
"flake-parts": "flake-parts",
@@ -590,11 +506,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1772402258,
"narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
"lastModified": 1771135771,
"narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
"rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
"type": "github"
},
"original": {
@@ -613,11 +529,11 @@
]
},
"locked": {
"lastModified": 1772893680,
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
"lastModified": 1771858127,
"narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
"type": "github"
},
"original": {
@@ -626,67 +542,14 @@
"type": "github"
}
},
"pyproject-build-systems": {
"inputs": {
"nixpkgs": [
"zut-calendar",
"nixpkgs"
],
"pyproject-nix": [
"zut-calendar",
"pyproject-nix"
],
"uv2nix": [
"zut-calendar",
"uv2nix"
]
},
"locked": {
"lastModified": 1771423342,
"narHash": "sha256-7uXPiWB0YQ4HNaAqRvVndYL34FEp1ZTwVQHgZmyMtC8=",
"owner": "pyproject-nix",
"repo": "build-system-pkgs",
"rev": "04e9c186e01f0830dad3739088070e4c551191a4",
"type": "github"
},
"original": {
"owner": "pyproject-nix",
"repo": "build-system-pkgs",
"type": "github"
}
},
"pyproject-nix": {
"inputs": {
"nixpkgs": [
"zut-calendar",
"nixpkgs"
]
},
"locked": {
"lastModified": 1771518446,
"narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=",
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937",
"type": "github"
},
"original": {
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"type": "github"
}
},
"root": {
"inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"hyprcursor-phinger": "hyprcursor-phinger",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim",
"wallpapers": "wallpapers",
"zut-calendar": "zut-calendar",
"zutui": "zutui"
"wallpapers": "wallpapers"
}
},
"systems": {
@@ -719,46 +582,6 @@
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"uv2nix": {
"inputs": {
"nixpkgs": [
"zut-calendar",
"nixpkgs"
],
"pyproject-nix": [
"zut-calendar",
"pyproject-nix"
]
},
"locked": {
"lastModified": 1772408201,
"narHash": "sha256-3Va9Tq/tg9ZuCX+PFd9oPgwtBDQRjjh60cYKZjZDxNM=",
"owner": "pyproject-nix",
"repo": "uv2nix",
"rev": "4bac9176117824d4550deeba9b86d9f96ac5d081",
"type": "github"
},
"original": {
"owner": "pyproject-nix",
"repo": "uv2nix",
"type": "github"
}
},
"wallpapers": {
"flake": false,
"locked": {
@@ -803,11 +626,11 @@
]
},
"locked": {
"lastModified": 1772669058,
"narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=",
"lastModified": 1761431178,
"narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "906d0ac159803a7df2dc1f948df9327670380f69",
"rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github"
},
"original": {
@@ -815,46 +638,6 @@
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
},
"zut-calendar": {
"inputs": {
"nixpkgs": "nixpkgs_5",
"pyproject-build-systems": "pyproject-build-systems",
"pyproject-nix": "pyproject-nix",
"uv2nix": "uv2nix"
},
"locked": {
"lastModified": 1773515729,
"narHash": "sha256-+TfrJdqRxmzarLednTCFfxDi1uGNYnIbtyLAFw2Pj0U=",
"owner": "szymon-jozef",
"repo": "zut-calendar",
"rev": "3284491807e196414445326d11913b43e7a0225f",
"type": "github"
},
"original": {
"owner": "szymon-jozef",
"repo": "zut-calendar",
"type": "github"
}
},
"zutui": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1771780756,
"narHash": "sha256-sRQn12tIvmolR6bCZpr8yEtlCVJeRGG7wzlAPlXGI6Y=",
"owner": "shv187",
"repo": "zutui",
"rev": "acc19d95399e1ba33440fe3158c3981f5e0f2d92",
"type": "github"
},
"original": {
"owner": "shv187",
"repo": "zutui",
"type": "github"
}
}
},
"root": "root",

108
flake.nix
View File

@@ -19,11 +19,6 @@
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
zut-calendar.url = "github:szymon-jozef/zut-calendar";
zutui.url = "github:shv187/zutui";
hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger";
};
outputs =
@@ -33,95 +28,68 @@
catppuccin,
nixvim,
wallpapers,
zut-calendar,
zutui,
...
}@inputs:
let
defaultUserConfig = {
userConfig = {
username = "szymon";
# for git
email = "szymon_jozef@proton.me";
fullName = "Szymon P";
# your public ssh key
signingKey = "~/.ssh/github.pub";
mainMonitor = "DP-1";
statusBar = "ashell"; # available: ashell | waybar
mainMonitor = "LVDS-1"; # only for some applications: you still need to set hyprland monitors yourself!
statusBar = "ashell"; # available: ashell|waybar
pathConfig = {
wallpaper = "Obrazy/tapety/catppuccin";
screenshot = "Obrazy/zrzuty/";
obsidian = "Dokumenty/obsidian";
};
isNixOS = true;
hostName = "default";
};
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
mkHome =
customConfig:
let
userConfig = defaultUserConfig // customConfig;
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs userConfig;
in
{
homeConfigurations = {
"arch" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
extraSpecialArgs = {
inherit
inputs
userConfig
;
isNixOS = false;
};
modules = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
inputs.hyprcursor-phinger.homeManagerModules.hyprcursor-phinger
(
{ pkgs, ... }:
{
home.packages = [
zut-calendar.packages.${pkgs.stdenv.hostPlatform.system}.default
zutui.packages.${pkgs.stdenv.hostPlatform.system}.default
];
}
)
]
++ (customConfig.extraModules or [ ]);
];
};
in
{
homeConfigurations = {
# You can overwrite default configuration here
"arch" = mkHome {
isNixOS = false;
hostName = "arch";
};
"nixos" = mkHome {
isNixOS = true;
hostName = "nixos";
};
"${defaultUserConfig.username}@pitagoras" = mkHome {
hostName = "pitagoras";
mainMonitor = "eDP-1";
};
"${defaultUserConfig.username}@pilecki" = mkHome {
hostName = "pilecki";
mainMonitor = "LVDS-1";
};
"${defaultUserConfig.username}@paderewski" = mkHome {
hostName = "paderewski";
"nixos" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
extraSpecialArgs = {
inherit
inputs
userConfig
;
isNixOS = true;
};
modules = [
./home.nix
catppuccin.homeModules.catppuccin
nixvim.homeModules.nixvim
];
};
};
};

View File

@@ -1 +0,0 @@
got: sha256-IGkP0z8gJj1dbNclpMebZXZvaRby1F8zGNEDPtitfqo=

View File

@@ -68,24 +68,13 @@
".config/gtk-3.0/gtk.css".source = ./dotfiles/gtk-3.0/gtk.css;
${userConfig.pathConfig.wallpaper}.source = inputs.wallpapers;
};
programs.hyprcursor-phinger.enable = true;
# === VARS ===
home = {
sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
};
pointerCursor = {
name = "phinger-cursors-light";
package = pkgs.phinger-cursors;
size = 24;
gtk.enable = true;
x11.enable = true;
};
home.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
XDG_DATA_DIRS = "$HOME/.nix-profile/share/applications:$XDG_DATA_DIRS";
};
programs.home-manager.enable = true;

View File

@@ -1,5 +1,6 @@
{
lib,
isNixOS,
userConfig,
pkgs,
...
@@ -8,7 +9,7 @@
{
programs.ashell = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
settings = {
outputs = {
Targets = [ userConfig.mainMonitor ];

View File

@@ -1,5 +1,6 @@
{
pkgs,
isNixOS,
userConfig,
...
}:
@@ -8,7 +9,7 @@
programs.waybar = {
enable = true;
package =
if userConfig.isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
if isNixOS then pkgs.waybar else (pkgs.writeShellScriptBin "waybar" "exec /usr/bin/waybar \"$@\"");
settings = {
mainBar = {
layer = "top";

View File

@@ -36,7 +36,7 @@
xdg.configFile."fastfetch/startup.jsonc".text = builtins.toJSON {
logo = {
source = "nixos_small";
source = "arch_small";
padding = {
bottom = 1;
};

View File

@@ -1,4 +1,4 @@
{ userConfig, ... }:
{ isNixOS, ... }:
{
programs.fish = {
@@ -17,8 +17,6 @@
fish_vi_key_bindings
direnv hook fish | source
fastfetch --config ~/.config/fastfetch/startup.jsonc
'';
@@ -47,7 +45,7 @@
set -l rel_file (realpath --relative-to=$config_dir $file)
if nh home switch $config_dir
if nh home switch $config_dir -c ${if isNixOS then "nixos" else "arch"}
git add -A
set commit_msg "update: $rel_file"
git commit -m "$commit_msg"
@@ -63,12 +61,17 @@
reload_dotfiles = {
body = # fish
"nh home switch ~/.config/home-manager";
"nh home switch ~/.config/home-manager -c ${if isNixOS then "nixos" else "arch"}";
};
reload_system = {
ls = {
body = # fish
"nh os switch /etc/nixos/";
"eza --long --icons --group-directories-first --git $argv";
};
lst = {
body = # fish
"eza --long --icons --color --git --tree $argv";
};
cp_mail = {
@@ -76,135 +79,49 @@
"pandoc $argv -t html |wl-copy -t text/html";
};
update_files = {
body =
# fish
''
echo "=== System packages updates ==="
pushd /etc/nixos
git add -A
git commit -m 'chore: state before pulling'
if git pull
reload_system
end
popd
echo "=== User packages update ==="
pushd $HOME/.config/home-manager
git add -A
git commit -m 'chore: state before pulling'
if git pull
reload_dotfiles
end
popd
'';
};
update = {
body =
if userConfig.isNixOS then
# fish
''
echo "=== System packages update ==="
pushd /etc/nixos
body = # fish
''
echo "===System update==="
if git pull
git add -A
git commit --allow-empty -m "chore: state before system update"
nix flake update
if test $status -eq 0
git add ./flake.lock
git commit --allow-empty -m "chore: update system flake.lock"
reload_system
git push
else
echo "Error while updating system flake!"
if not type -q yay
echo "Yay not found Is this Arch? If yes, then please consider installing it!"
else
yay
end
if type -q pacman
echo "===Remove orphans==="
set orphans (pacman -Qtdq)
if test (count $orphans) -gt 0
sudo pacman -Rns $orphans
end
else
echo "Error: 'git pull' failed in /etc/nixos. Skipping system update."
end
end
popd
echo "=== User packages update ==="
pushd $HOME/.config/home-manager
if git pull
git add -A
git commit --allow-empty -m "chore: state before home-manager update"
nix flake update
if test $status -eq 0
git add ./flake.lock
git commit --allow-empty -m "chore: update home flake.lock"
git push
reload_dotfiles
else
echo "Error while updating home flake!"
end
else
echo "Error: 'git pull' failed in home-manager. Skipping user update."
end
popd
if type -q flatpak
echo "=== Flatpak update ==="
if type -q flatpak
echo "===Flatpak update==="
flatpak update --noninteractive
echo "=== Flatpak remove unused ==="
flatpak uninstall --unused --noninteractive
end
''
else
# fish
''
echo "===System update==="
echo "===Flatpak remove unused==="
flatpak uninstall --unused
end
if not type -q yay
echo "Yay not found Please consider installing it!"
else
yay
end
if type -q pacman
echo "===Remove orphans==="
set orphans (pacman -Qtdq)
if test (count $orphans) -gt 0
sudo pacman -Rns $orphans
end
end
if type -q flatpak
echo "===Flatpak update==="
flatpak update --noninteractive
echo "===Flatpak remove unused==="
flatpak uninstall --unused
end
if type -q nix-channel
echo "===Nix update==="
nix-channel --update
echo "===Nix garbage collection==="
home-manager expire-generations "-7 days"
end
'';
if type -q nix-channel
echo "===Nix update==="
nix-channel --update
echo "===Nix garbage collection==="
home-manager expire-generations "-7 days"
end
'';
};
};
shellAliases = {
ls = "eza --long --icons --group-directories-first --git";
lst = "eza --long --icons --color --git --tree";
rm = "trash";
rm = {
body = "trash $argv";
};
open = {
body = "nohup xdg-open $argv > /dev/null & ";
};
};
};
}

View File

@@ -41,7 +41,6 @@
"node_modules"
"result"
"__pycache__"
".direnv"
];
};

View File

@@ -100,30 +100,6 @@
action.__raw = "function() require('harpoon'):list():next() end";
options.desc = "Toggle next harpoon buffer";
}
{
key = "j";
action= "jzz";
}
{
key = "k";
action= "kzz";
}
{
key = "[[";
action= "[[zz";
}
{
key = "]]";
action= "]]zz";
}
{
key = "{{";
action= "{{zz";
}
{
key = "}}";
action= "}}zz";
}
];
autoGroups = {
@@ -227,14 +203,9 @@
};
};
cursorline = {
indent-blankline = {
enable = true;
timeout = 0;
};
mini-indentscope = {
enable = true;
settings.draw.delay = 0;
settings.scope.enabled = true;
};
cmp = {

View File

@@ -4,7 +4,6 @@
gtk = {
enable = true;
colorScheme = "dark";
gtk4.theme = null;
};
dconf = {

View File

@@ -1,8 +1,8 @@
{ userConfig, lib, ... }:
{ isNixOS, lib, ... }:
{
programs.chromium = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
};
}

View File

@@ -1,9 +1,9 @@
{ lib, userConfig, ... }:
{ lib, isNixOS, ... }:
{
programs.kitty = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
settings = {
confirm_os_window_close = 0;
dynamic_background_opacity = true;

View File

@@ -1,4 +1,4 @@
{ userConfig, pkgs, ... }:
{ isNixOS, pkgs, ... }:
{
services.mako = {
@@ -21,7 +21,7 @@
progress-color = "over #313244";
output = "DP-1";
on-notify =
if userConfig.isNixOS then
if isNixOS then
"exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
else
"exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga";
@@ -36,7 +36,7 @@
[urgency=critical]
on-notify=${
if userConfig.isNixOS then
if isNixOS then
"exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
else
"exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"

View File

@@ -1,7 +1,7 @@
{
config,
pkgs,
userConfig,
isNixOS,
...
}:
@@ -10,7 +10,7 @@
programs.mangohud = {
enable = true;
package = if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
package = if isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
};
xdg.configFile."MangoHud/MangoHud.conf".text = ''

View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
owner = "catppuccin";
repo = "obsidian";
rev = "main";
hash = "sha256-uB0a2nSZkHHf65xBYXyNh50vaAiqdEpKQVf3eXnCVlE=";
hash = "sha256-sN5k263geOtJ1mOCQGM8UdmA/71OhBI5NRwGxJwd80E=";
};
installPhase = ''

View File

@@ -1,4 +1,5 @@
{
isNixOS,
lib,
pkgs,
userConfig,
@@ -8,7 +9,7 @@
{
programs.obsidian = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
defaultSettings = {
app = {

View File

@@ -1,5 +1,6 @@
{
lib,
isNixOS,
userConfig,
...
}:
@@ -7,7 +8,7 @@
{
programs.satty = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
settings = {
general = {
fullscreen = true;

View File

@@ -1,9 +1,9 @@
{ userConfig, lib, ... }:
{ isNixOS, lib, ... }:
{
services.hypridle = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
settings = {
general = {

View File

@@ -1,12 +1,13 @@
{
isNixOS,
lib,
userConfig,
pkgs,
inputs,
pkgs,
...
}:
let
exe = pkg: bin: if userConfig.isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
exe = pkg: bin: if isNixOS then "${pkg}/bin/${bin}" else "/usr/bin/${bin}";
jq = exe pkgs.jq "jq";
grim = exe pkgs.grim "grim";
@@ -14,7 +15,7 @@ let
wl_copy = exe pkgs.wl-clipboard "wl-copy";
notify_send = exe pkgs.libnotify "notify-send";
xdg-desktop-portal-hyprland =
if userConfig.isNixOS then
if isNixOS then
"${pkgs.xdg-desktop-portal-hyprland}/libexec/xdg-desktop-portal-hyprland"
else
"/usr/lib/xdg-desktop-portal-hyprland";
@@ -25,9 +26,9 @@ in
wayland.windowManager.hyprland = {
enable = true;
package =
if userConfig.isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
portalPackage = lib.mkIf (
userConfig.isNixOS
isNixOS
) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
xwayland.enable = true;
@@ -35,9 +36,9 @@ in
"$mainMod" = "SUPER";
"$terminal" = "uwsm app -- kitty";
"$menu" = "hyprlauncher";
"$music_player" = if userConfig.isNixOS then "spotify" else "flatpak run com.spotify.Client";
"$music_player" = "flatpak run com.spotify.Client";
"$notes" = "obsidian";
"$browser" = if userConfig.isNixOS then "zen-beta" else "zen-browser"; # beta on nixos
"$browser" = "zen-browser";
"$openrgb_color" = "09ce30";
env = [
@@ -59,7 +60,7 @@ in
};
animations = {
enabled = false;
enabled = true;
bezier = [
"easeOutQuint,0.23,1,0.32,1"
"easeInOutCubic,0.65,0.05,0.36,1"
@@ -134,18 +135,13 @@ in
kb_options = "caps:escape_shifted_capslock";
kb_rules = "";
follow_mouse = 1;
left_handed = false;
sensitivity = -0.5;
left_handed = true;
sensitivity = 0;
touchpad = {
natural_scroll = true;
};
};
device = {
name = "msft0001:01-06cb:7f28-touchpad";
sensitivity = 0;
};
cursor = {
no_hardware_cursors = true;
inactive_timeout = 5;
@@ -178,7 +174,6 @@ in
workspace = [
"1, monitor:DP-2"
"1, layout: dwindle"
"2, monitor:DP-1"
"3, monitor:DP-1"
"4, monitor:DP-1"
@@ -202,7 +197,6 @@ in
"match:class ^(vesktop)$, workspace 1 silent"
"match:class ^(chrome-facebook.com__-Default)$, workspace 1"
"match:class ^(zen)$, workspace 2"
"match:class ^(zen-beta)$, workspace 2"
"match:class ^(com.github.IsmaelMartinez.teams_for_linux)$, workspace 2"
"match:class ^(FreeTube)$, workspace 2"
"match:class ^(brave-x.com__-Default)$, workspace 2"
@@ -214,7 +208,6 @@ in
"match:class ^(net.lutris.Lutris)$, workspace 3"
"match:class ^(rpcs3)$, workspace 3"
"match:class ^(winboat)$, workspace 5"
"match:class ^(qemu)$, workspace 5"
"match:class ^(obsidian)$, workspace 6"
"match:class ^(gimp)$, workspace 8"
"match:class .*potify, workspace 9 silent"
@@ -356,6 +349,8 @@ in
bindd = [
"$mainMod, F, Make app fullscreen, fullscreen"
"$mainMod, T, Toggle floating, togglefloating"
"$mainMod, P, Toggle pseudo, pseudo"
"$mainMod, S, Toggle split, togglesplit"
"$mainMod, Q, Kill active window, killactive"
];
};

View File

@@ -1,9 +1,9 @@
{ userConfig, lib, ... }:
{ isNixOS, lib, ... }:
{
services.hyprlauncher = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
settings = {
cache.enabled = true;

View File

@@ -1,9 +1,9 @@
{ userConfig, lib, ... }:
{ isNixOS, lib, ... }:
{
programs.hyprlock = {
enable = true;
package = lib.mkIf (!userConfig.isNixOS) null;
package = lib.mkIf (!isNixOS) null;
settings = {
"$font" = "Monospace";

View File

@@ -1,5 +1,5 @@
{
userConfig,
isNixOS,
pkgs,
...
}:
@@ -8,7 +8,7 @@
services.hyprsunset = {
enable = true;
package =
if userConfig.isNixOS then
if isNixOS then
pkgs.hyprsunset
else
(pkgs.writeShellScriptBin "hyprsunset" "exec /usr/bin/hyprsunset \"$@\"");

View File

@@ -2,6 +2,9 @@
{
home.packages = with pkgs; [
waypaper
swww
gnupg
libnotify
cliphist
gh
@@ -19,11 +22,5 @@
slurp
bc
nh
runc
];
xdg.configFile."containers/containers.conf".text = ''
[engine]
runtime = "runc"
'';
}

View File

@@ -59,6 +59,5 @@ in
videos = "$HOME/Video";
templates = null;
publicShare = null;
setSessionVariables = true;
};
}

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -e
rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/uwu_backup/home/szymon/
rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/wd_backup/home/szymon/
rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/backup/home/szymon/
rsync -avh --no-links --delete --exclude=.* --exclude=dyski /home/szymon/ /mnt/backup_wd/home/szymon/