diff --git a/flake.lock b/flake.lock index bf1e8f3..bf6910f 100644 --- a/flake.lock +++ b/flake.lock @@ -198,11 +198,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1757683904, - "narHash": "sha256-L9EIKWKKHwDCA8UgZSqK3L9NW8ATg+6sROMPkxKYCPU=", + "lastModified": 1757789833, + "narHash": "sha256-cpYiHtQ9ROyutuFEkqDNkc3sOVayEeNHAtCVQI5reoc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "558b28d33e88d8d446929ff32899248b1298d51f", + "rev": "5a088eb3f84aeea80b2d240e25c4f72a0fbdea4e", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1757695043, - "narHash": "sha256-33OsSuYkRqnqSznO0qPpjrfKQJAg0zi/uX0a4B/3mOU=", + "lastModified": 1757815368, + "narHash": "sha256-E61yxlH2VWxEIeF62sO2mrZW8xk7WIi3SQvOZHyv4SU=", "owner": "KyleKrein", "repo": "DesktopShell", - "rev": "27344a47e2d2b73a392d3283a220aed1f13bc2bb", + "rev": "ba6c7ae28c0be2cbb128853dbe47ac1fe15bacda", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1757599015, - "narHash": "sha256-vs84DJ+DlfqNrwz4q/TZAEMCQSMacpcI2x35+GkbvX0=", + "lastModified": 1757849813, + "narHash": "sha256-CQjz4OeWgbXG0KRBNDuFHmF8PI4sp7wEInsnDwNu6/U=", "owner": "kylekrein", "repo": "emacs-config", - "rev": "220ec32d43043b27597462b324d26f9b0d09273c", + "rev": "710efef5721f3c04b8bd51630fc4687631b5f647", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1757581750, - "narHash": "sha256-BKVQ35IRqe3ejmtJlwLRzaw8M7Qs0KDzeNIkJlHaKD8=", + "lastModified": 1757840843, + "narHash": "sha256-/KR/ogpCJBQHGxGdCofHUB4XQ3rwTgtF00sWdMVM+eY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "41e2499a89e1bfa717fd2403b675c6c72c65e9fa", + "rev": "9cd95e71509023c2e4641433fd1a56581589fb99", "type": "github" }, "original": { @@ -998,7 +998,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_8" }, "locked": { "lastModified": 1694529238, @@ -1149,11 +1149,11 @@ ] }, "locked": { - "lastModified": 1757598712, - "narHash": "sha256-5PWVrdMp8u31Q247jqnJcwxKg3MJrs1TadTyTBRVBDY=", + "lastModified": 1757698511, + "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d7c11a0adee0db21e3a8ef90ae07bb89bc20b8f", + "rev": "a3fcc92180c7462082cd849498369591dfb20855", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -1183,6 +1183,28 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "rose-pine-hyprcursor", + "nixpkgs" + ], + "systems": "systems_6" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -1261,11 +1283,11 @@ }, "master": { "locked": { - "lastModified": 1757695067, - "narHash": "sha256-YevQrJiEsqW6KIkLG9VR1WdzsLN714EmwGg6whQi/E4=", + "lastModified": 1757849838, + "narHash": "sha256-1z1OdFWwsmWZ87xZ6FYuzhe5fxHcmj4puDTPwvxWN7Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2a9ea24125277defd7ea9ec9b53d7147ed8ecd3e", + "rev": "dfa87d116e876b1e7bf85b0ed78f41abbb8e6c3a", "type": "github" }, "original": { @@ -1349,11 +1371,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757671360, - "narHash": "sha256-XXDAhFbVeTEanzS1HVcqwagsuWNFApe5YThlVarZut0=", + "lastModified": 1757836781, + "narHash": "sha256-1OSxFylf3orQ+UjLlrYIm7gibhDUm1heXVZC/kdJ5LA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f9d9c624257f4c817f1043eb10374e9a4a159eb7", + "rev": "8354fa85074d42cf0743458c316cabf55c1ab553", "type": "github" }, "original": { @@ -1382,11 +1404,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757656821, - "narHash": "sha256-MDaLusQZflxngGMU41g6cqabM7KE8I55UazzAZsjNN0=", + "lastModified": 1757832020, + "narHash": "sha256-SCdus7r4IS8l3jzF8mcMFMlDvACTdmDCcsPnGUEqll0=", "owner": "YaLTeR", "repo": "niri", - "rev": "b7909dbf61c7c1511b9a51ef46e1d503d5ba3d05", + "rev": "e6a8ad38479eb179dc7301755316f993e3e872ea", "type": "github" }, "original": { @@ -1520,11 +1542,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1757641478, - "narHash": "sha256-PZp0uvF6++tVln91cX8t0ZALMZHHoX++eeG7ysKgt1c=", + "lastModified": 1757814419, + "narHash": "sha256-wmlDAkOrwX9cvhXQa7wekGr/5G6SfE2D5KlvuvSEEXc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "5cba556b6c1a6fa4ea9c28d2e4cf946eff45ac07", + "rev": "17db183a6a2ba1217bbfc123b47d4b5ee70b256a", "type": "github" }, "original": { @@ -1637,11 +1659,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757775351, + "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5", "type": "github" }, "original": { @@ -1780,11 +1802,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -1796,11 +1818,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1756911493, - "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -1844,11 +1866,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "lastModified": 1757746433, + "narHash": "sha256-fEvTiU4s9lWgW7mYEU/1QUPirgkn+odUBTaindgiziY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "rev": "6d7ec06d6868ac6d94c371458fc2391ded9ff13d", "type": "github" }, "original": { @@ -4315,6 +4337,7 @@ "nixpkgs": "nixpkgs_13", "pre-commit-hooks": "pre-commit-hooks", "quickshell": "quickshell_2", + "rose-pine-hyprcursor": "rose-pine-hyprcursor", "snowfall-flake": "snowfall-flake", "snowfall-lib": "snowfall-lib_3", "sops-nix": "sops-nix", @@ -4322,6 +4345,28 @@ "unstable": "unstable" } }, + "rose-pine-hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils_2" + }, + "locked": { + "lastModified": 1748096947, + "narHash": "sha256-ouuA8LVBXzrbYwPW2vNjh7fC9H2UBud/1tUiIM5vPvM=", + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "rev": "4b02963d0baf0bee18725cf7c5762b3b3c1392f1", + "type": "github" + }, + "original": { + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "type": "github" + } + }, "rust-analyzer-src": { "flake": false, "locked": { @@ -4347,11 +4392,11 @@ ] }, "locked": { - "lastModified": 1757558036, - "narHash": "sha256-DyZaeaHy8iibckZ63XOqYJtEHc3kmVy8JrBIBV/GQHI=", + "lastModified": 1757730403, + "narHash": "sha256-Jxl4OZRVsXs8JxEHUVQn3oPu6zcqFyGGKaFrlNgbzp0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b8adf899786b7b77b8c3636a9b753e3622f00db0", + "rev": "3232f7f8bd07849fc6f4ae77fe695e0abb2eba2c", "type": "github" }, "original": { @@ -4516,11 +4561,11 @@ "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1757503115, - "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", + "lastModified": 1757847158, + "narHash": "sha256-TumOaykhZO8SOs/faz6GQhqkOcFLoQvESLSF1cJ4mZc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", + "rev": "ee6f91c1c11acf7957d94a130de77561ec24b8ab", "type": "github" }, "original": { @@ -4540,7 +4585,7 @@ "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_15", "nur": "nur", - "systems": "systems_7", + "systems": "systems_9", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -4638,6 +4683,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -4652,7 +4712,22 @@ "type": "github" } }, - "systems_7": { + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_9": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -4793,11 +4868,11 @@ }, "unstable": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -4825,6 +4900,24 @@ "type": "github" } }, + "utils_2": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 686f8a3..33a10fa 100644 --- a/flake.nix +++ b/flake.nix @@ -101,6 +101,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; desktopShell.url = "github:KyleKrein/DesktopShell"; + rose-pine-hyprcursor = { + url = "github:ndom91/rose-pine-hyprcursor"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: let diff --git a/homes/x86_64-linux/andrej/hyprland.nix b/homes/x86_64-linux/andrej/hyprland.nix index 67e0294..11ed657 100644 --- a/homes/x86_64-linux/andrej/hyprland.nix +++ b/homes/x86_64-linux/andrej/hyprland.nix @@ -28,12 +28,8 @@ jq kdePackages.gwenview kdePackages.ark + inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default ]; - home.sessionVariables = { - GTK_THEME = "Colloid"; - }; - qt.enable = true; - qt.style.name = "gtk3"; xdg.configFile."quickshell".source = "${ inputs.desktopShell.packages.${pkgs.system}.dankMaterialShell }/etc/xdg/quickshell"; diff --git a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix index 3c11574..6ac8f87 100644 --- a/homes/x86_64-linux/kylekrein/niri/desktopShell.nix +++ b/homes/x86_64-linux/kylekrein/niri/desktopShell.nix @@ -27,7 +27,6 @@ in glib khal # calendar gammastep # night mode - colloid-gtk-theme qt6ct grim slurp @@ -51,10 +50,10 @@ in ".local/share/color-schemes/DankMatugen.colors" ]; directories = [ - ".config/qt5ct" - ".config/qt6ct" - ".config/gtk-3.0" - ".config/gtk-4.0" + #".config/qt5ct" + #".config/qt6ct" + #".config/gtk-3.0" + #".config/gtk-4.0" ]; }; }; diff --git a/homes/x86_64-linux/kylekrein/niri/theme.nix b/homes/x86_64-linux/kylekrein/niri/theme.nix new file mode 100644 index 0000000..fe5ff62 --- /dev/null +++ b/homes/x86_64-linux/kylekrein/niri/theme.nix @@ -0,0 +1,25 @@ +{ + osConfig, + config, + pkgs, + lib, + inputs, + namespace, + ... +}: +with lib.custom; let + username = config.snowfallorg.user.name; + home = config.snowfallorg.user.home.directory; + impermanence = config.${namespace}.impermanence; +in + lib.mkIf osConfig.custom.windowManagers.niri.enable { + home.packages = with pkgs; [ + nordic + ]; + + programs.niri = { + settings = { + cursor.theme = "Nordic-cursors"; + }; + }; + }