Compare commits

..

12 Commits

Author SHA1 Message Date
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
28 changed files with 609 additions and 508 deletions

599
flake.lock generated
View File

@@ -1,17 +1,48 @@
{
"nodes": {
"catppuccin": {
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1777024856,
"narHash": "sha256-OQ+yIcRMXo4UaHyX+W5DCgBvJ5dZo/3kFGWPJiuR6x8=",
"lastModified": 1771610171,
"narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"catppuccin": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1771587924,
"narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
"owner": "catppuccin",
"repo": "nix",
"rev": "f41cc1cf13647e482b7317396f749840ef715e16",
"rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
"type": "github"
},
"original": {
@@ -20,6 +51,22 @@
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "NixOS",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -28,11 +75,11 @@
]
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github"
},
"original": {
@@ -41,21 +88,25 @@
"type": "github"
}
},
"flake-utils": {
"gitignore": {
"inputs": {
"systems": "systems_2"
"nixpkgs": [
"hyprland",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
@@ -66,11 +117,11 @@
]
},
"locked": {
"lastModified": 1777218285,
"narHash": "sha256-d2FY71SBVKVbT1PsfXA71jz0vD520NijS4lrcvUMeGk=",
"lastModified": 1772060133,
"narHash": "sha256-VuyRptb8v1lVGMlLp4/1vRX3Efwec0CN0S6mKmDPzLg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c55c498c9aa205b16cca78b57a7275625726d532",
"rev": "ce9b6e52500a0ea0ec48f0bbf6d7a3e431d9dfa4",
"type": "github"
},
"original": {
@@ -79,35 +130,336 @@
"type": "github"
}
},
"hyprcursor-phinger": {
"hyprcursor": {
"inputs": {
"nixpkgs": "nixpkgs"
"hyprlang": [
"hyprland",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1763845612,
"narHash": "sha256-78zH5GrYa35bEkzeVnl8uXFbZ/zsiSHayjxZlNt+Xe8=",
"owner": "jappie3",
"repo": "hyprcursor-phinger",
"rev": "1207a845501a28e0e00d4a8e935ee0c9cab30650",
"lastModified": 1753964049,
"narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
"type": "github"
},
"original": {
"owner": "jappie3",
"repo": "hyprcursor-phinger",
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprgraphics": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1770511807,
"narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "7c75487edd43a71b61adb01cae8326d277aab683",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprgraphics",
"type": "github"
}
},
"hyprland": {
"inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-guiutils": "hyprland-guiutils",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"hyprwire": "hyprwire",
"nixpkgs": "nixpkgs_2",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
"lastModified": 1772107319,
"narHash": "sha256-qdeeNrWmUe1P2FsnNU1ngoZl8UxczEMJBziwm78V42I=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "c71fbd854dfdedaae011f4b8b1fdb81f8054b309",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-guiutils": {
"inputs": {
"aquamarine": [
"hyprland",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprtoolkit": "hyprtoolkit",
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1767023960,
"narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1765214753,
"narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1771866172,
"narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprtoolkit": {
"inputs": {
"aquamarine": [
"hyprland",
"hyprland-guiutils",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprland-guiutils",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprland-guiutils",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-guiutils",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprland-guiutils",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"hyprland-guiutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-guiutils",
"systems"
]
},
"locked": {
"lastModified": 1764592794,
"narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
"rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprtoolkit",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1771271487,
"narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1770501770,
"narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"type": "github"
}
},
"hyprwire": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1771606233,
"narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
"owner": "hyprwm",
"repo": "hyprwire",
"rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprwire",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1762977756,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"owner": "nixos",
"lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -115,11 +467,27 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1776877367,
"narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
"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": "0726a0ecb6d4e08f6adced58726b95db924cef57",
"rev": "2fc6539b481e1d2569f25f8799236694180c0993",
"type": "github"
},
"original": {
@@ -135,14 +503,14 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1777218776,
"narHash": "sha256-8juiX5HT2Bp4+qXLCFNRdIL10X8ySiAbgl/QhJDt+24=",
"lastModified": 1771135771,
"narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "d404af65e951f648272d178a34cbb2292fb93689",
"rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
"type": "github"
},
"original": {
@@ -151,53 +519,26 @@
"type": "github"
}
},
"pyproject-build-systems": {
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"gitignore": "gitignore",
"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",
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1771518446,
"narHash": "sha256-nFJSfD89vWTu92KyuJWDoTQJuoDuddkJV3TlOl1cOic=",
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"rev": "eb204c6b3335698dec6c7fc1da0ebc3c6df05937",
"lastModified": 1771858127,
"narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
"type": "github"
},
"original": {
"owner": "pyproject-nix",
"repo": "pyproject.nix",
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
@@ -205,26 +546,24 @@
"inputs": {
"catppuccin": "catppuccin",
"home-manager": "home-manager",
"hyprcursor-phinger": "hyprcursor-phinger",
"nixpkgs": "nixpkgs_2",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_3",
"nixvim": "nixvim",
"wallpapers": "wallpapers",
"zut-calendar": "zut-calendar",
"zutui": "zutui"
"wallpapers": "wallpapers"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"repo": "default-linux",
"type": "github"
}
},
@@ -243,31 +582,6 @@
"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": {
@@ -284,47 +598,44 @@
"type": "github"
}
},
"zut-calendar": {
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"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"
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1774282006,
"narHash": "sha256-tF+/CbZhOvIl4F/WJtT2V376WjGIXSFXRSDMGI11KJk=",
"owner": "shv187",
"repo": "zutui",
"rev": "fcce7c254c74638efa667df7a4f603d01362a835",
"lastModified": 1761431178,
"narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github"
},
"original": {
"owner": "shv187",
"repo": "zutui",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
}

133
flake.nix
View File

@@ -1,42 +1,24 @@
{
description = "Amazing dotfiles";
description = "Home manager config";
inputs = {
hyprland.url = "github:hyprwm/Hyprland";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
# hyprland.url = "github:hyprwm/Hyprland";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
# theming stuff
catppuccin = {
url = "github:catppuccin/nix";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprcursor-phinger.url = "github:jappie3/hyprcursor-phinger";
catppuccin.url = "github:catppuccin/nix";
wallpapers = {
url = "github:orangci/walls-catppuccin-mocha";
flake = false;
};
# uni stuff
zut-calendar = {
url = "github:szymon-jozef/zut-calendar";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
zutui = {
url = "github:shv187/zutui";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
@@ -46,97 +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 = "eDP-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";
animations = true;
};
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";
animations = false;
};
"${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

@@ -21,7 +21,7 @@
catppuccin = {
enable = true;
flavor = "mocha";
accent = "sapphire";
accent = "mauve";
};
imports = [
@@ -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;

0
install_nix_and_home_manager_on_arch.sh Executable file → Normal file
View File

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 ];
@@ -17,7 +18,7 @@
modules = {
left = [
"Tempo"
"Clock"
"Workspaces"
];
center = [ "WindowTitle" ];
@@ -66,13 +67,8 @@
}
];
tempo = {
clock_format = "%H:%M | %e.%m ";
};
media_player = {
max_title_length = 50;
indicator_format = "Icon";
clock = {
format = "%H:%M | %e.%m ";
};
settings = {
@@ -81,7 +77,7 @@
appearance = {
scale_factor = 1.2;
style = "Islands";
style = "Gradient";
success_color = "#a6e3a1";
text_color = "#cdd6f4";
workspace_colors = [

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,39 +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";
}
{
mode = "n";
key = "<leader>cr";
action = ":w<CR>:TermExec cmd='mkdir -p ./out && g++ \"%\" -o \"./out/%:r\" && ./out/\"%:r\"'<CR>";
options = {
desc = "Compile and run current cpp file";
silent = true;
};
}
];
autoGroups = {
@@ -202,22 +169,7 @@
friendly-snippets.enable = true;
# dev
clangd.enable = true;
pylsp = {
enable = true;
settings = {
plugins = {
ruff = {
enabled = true;
format = [ "I" ];
};
pylsp_mypy.enabled = true;
jedi_completion.enabled = true;
jedi_definition.enabled = true;
};
};
};
pyright.enable = true;
rust_analyzer = {
enable = true;
installCargo = true;
@@ -251,18 +203,11 @@
};
};
cursorline = {
indent-blankline = {
enable = true;
timeout = 0;
settings.scope.enabled = true;
};
mini-indentscope = {
enable = true;
settings.draw.delay = 0;
};
toggleterm.enable = true;
cmp = {
enable = true;
settings = {

View File

@@ -2,6 +2,7 @@
{
services.ssh-agent.enable = true;
services.ssh-agent.enableFishIntegration = true;
programs.ssh = {
enableDefaultConfig = false;

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,18 +1,18 @@
{ 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;
enable_audio_bell = false;
mouse_hide_wait = "-1.0";
window_padding_width = 10;
background_opacity = "0.95";
font_size = 12;
background_blur = 15;
background_opacity = "0.5";
font_size = 14;
background_blur = 5;
symbol_map =
let
mappings = [

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,22 +26,19 @@ in
wayland.windowManager.hyprland = {
enable = true;
package =
if userConfig.isNixOS then
# inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
pkgs.hyprland
else
null;
#portalPackage = lib.mkIf (userConfig.isNixOS
#) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
if isNixOS then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland else null;
portalPackage = lib.mkIf (
isNixOS
) inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
xwayland.enable = true;
settings = {
"$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 = [
@@ -62,7 +60,7 @@ in
};
animations = {
enabled = userConfig.animations;
enabled = true;
bezier = [
"easeOutQuint,0.23,1,0.32,1"
"easeInOutCubic,0.65,0.05,0.36,1"
@@ -110,6 +108,7 @@ in
};
dwindle = {
pseudotile = true;
preserve_split = true;
};
@@ -136,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;
@@ -174,13 +168,12 @@ in
"wl-paste --type text --watch cliphist store"
"wl-paste --type image --watch cliphist store"
"uwsm app -- ${userConfig.statusBar}"
"awww-daemon"
"swww-daemon"
"openrgb -c $openrgb_color"
];
workspace = [
"1, monitor:DP-2"
"1, layout: dwindle"
"2, monitor:DP-1"
"3, monitor:DP-1"
"4, monitor:DP-1"
@@ -204,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"
@@ -216,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"
@@ -358,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/