From e1ca607a017830caa5e0cd120608cdfff92f22ec Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 15 Jan 2026 16:15:28 +0100 Subject: [PATCH] Nixos update 15-01-2026, fix hyprland config --- flake.lock | 134 ++++++++++++------------ machines/fujin/main/default.nix | 2 +- machines/fujin/main/home.nix | 2 +- modules/development/emacs/default.nix | 2 +- modules/window-manager/hypr/default.nix | 11 +- 5 files changed, 73 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 11fb938..73c2cb5 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767553012, - "narHash": "sha256-q1wydwdwNojmJT46In5g0BE72moiomujZWHCNqd0/cg=", + "lastModified": 1768466343, + "narHash": "sha256-myRUJAhjxgFDlU4T2xpMrF6chzmHcjchtwBZbNvWfvo=", "owner": "9001", "repo": "copyparty", - "rev": "7ffb1fd0ca5a5968782ae980aab3869d2b6b6dda", + "rev": "d32704ed3700940e6284eedacf174236c26cc337", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1767602082, - "narHash": "sha256-RX5iNvIz5A8G93ej6lyTT9+Jn48Cc3OM8JAMLh6x9Og=", + "lastModified": 1768468703, + "narHash": "sha256-+Jj1SzUZjvR6tWjc19o4D8D+AcU8x/JfRxbFEhbxoLE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d6c9480637f35c75a0c36c57d49352ca466332ca", + "rev": "ab462255f86920af9d02c11f5671ce07ee0f7b97", "type": "github" }, "original": { @@ -163,11 +163,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", "type": "gitlab" }, "original": { @@ -422,11 +422,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767523459, - "narHash": "sha256-Z3EijMLd18cg8arhXv+A/tNiknQIYaeWQVoCNUm+c4A=", + "lastModified": 1768319076, + "narHash": "sha256-is65o80lB9tWMekx77O4+GCQxLeB2kiA60hejzpA+HA=", "ref": "refs/heads/main", - "rev": "0b3b012817ca381e40754cb4408e5c0cd3a2c732", - "revCount": 6774, + "rev": "e0cf88809de12c39ad8a1ad1c0194967b0029ec8", + "revCount": 6809, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1767473668, - "narHash": "sha256-KLybElvKmWkCJBVgEesy7OueJsmDhksfbDFJ3UltPlk=", + "lastModified": 1767723101, + "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "a084d66d7d1334b89a07d0022fa12049141cb119", + "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1766997865, - "narHash": "sha256-pcmoWAlf/CSDFNptUAYKG3k8FwGNYSJBDF6li9+y+cI=", + "lastModified": 1768224538, + "narHash": "sha256-EnlltFxfV4IyY0Jl4lri+9p2aR37tKIUAXwsQ+t0t/A=", "owner": "Mic92", "repo": "nix-ld", - "rev": "f388fe13b4370336982c53916744028465fbfc81", + "rev": "087d8b8d593c4e7d919a571fd68552020d41a41a", "type": "github" }, "original": { @@ -787,11 +787,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1768397375, + "narHash": "sha256-7QqbFi3ERvKjEdAzEYPv7iSGwpUKSrQW5wPLMFq45AQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "efe2094529d69a3f54892771b6be8ee4a0ebef0f", "type": "github" }, "original": { @@ -818,11 +818,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -834,11 +834,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -866,11 +866,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767051569, - "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", + "lastModified": 1767313136, + "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", + "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", "type": "github" }, "original": { @@ -922,11 +922,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -987,11 +987,11 @@ ] }, "locked": { - "lastModified": 1767499857, - "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", + "lastModified": 1768271704, + "narHash": "sha256-jJqlW8A3OZ5tYbXphF7U8P8g/3Cn8PPwPa4YlJ/9agg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "rev": "691b8b6713855d0fe463993867291c158472fc6f", "type": "github" }, "original": { @@ -1008,11 +1008,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1767533601, - "narHash": "sha256-FtitmvggxcZqCEKhYIN66td6JONenoTsuOFVS9pYi5E=", + "lastModified": 1767711026, + "narHash": "sha256-yTuyde8TpBR3NhNnOcK4uOGukvMCwrH3otP8E04e9X0=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "7b179721fcd272154d2917e9c4a7f9659c6104a2", + "rev": "764548c3aa22c9f4cb436ec7243d21795eb6ebec", "type": "github" }, "original": { @@ -1042,11 +1042,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1767559556, - "narHash": "sha256-Pf1d9Hh9UUQ/oS+evq6dU0MiaDczXXNztTlQekaMbW0=", + "lastModified": 1768403292, + "narHash": "sha256-9DCTgR4Dhzzh5zldoHltJRx33tVuy5eHOd5T5+w05JI=", "owner": "nix-community", "repo": "stylix", - "rev": "b135edbdd403896d1ef507934c045f716deb5609", + "rev": "3894cae75cf50d9a8f707768b229c90e2654d8bc", "type": "github" }, "original": { @@ -1136,11 +1136,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -1152,11 +1152,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -1183,11 +1183,11 @@ }, "unstable": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1768305791, + "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", "type": "github" }, "original": { @@ -1204,11 +1204,11 @@ ] }, "locked": { - "lastModified": 1767556355, - "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", + "lastModified": 1768434960, + "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", + "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", "type": "github" }, "original": { @@ -1284,11 +1284,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1767568852, - "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=", + "lastModified": 1768379550, + "narHash": "sha256-z94S29l5V86h11LZbPIMbHTJyksDG63aqISsZkTTuJY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "350c729b261e6f5529460140a5f0943dd4c5e156", + "rev": "06f61b4e4f4f6ba8027c96a5611c63dc0db12b90", "type": "github" }, "original": { diff --git a/machines/fujin/main/default.nix b/machines/fujin/main/default.nix index e033ca2..7f84684 100644 --- a/machines/fujin/main/default.nix +++ b/machines/fujin/main/default.nix @@ -21,7 +21,7 @@ "$6$5xuxfP8HapkkyDa5$qr2wkpibMaNSIiJIPojWC4CO1X31HNJZEfmYfReYrwOSoflf0rMrQk.EZj5uzh/K/NalQMnCiDcmvFBuf9a5p0"; packages = with pkgs; [ # thunar plugin to manager archives - xfce.thunar-archive-plugin + thunar-archive-plugin # Stow, to manage my doom emacs configs stow diff --git a/machines/fujin/main/home.nix b/machines/fujin/main/home.nix index 142a91b..65b91f3 100644 --- a/machines/fujin/main/home.nix +++ b/machines/fujin/main/home.nix @@ -104,7 +104,7 @@ discord # development - jetbrains.idea-ultimate + jetbrains.idea jetbrains.webstorm #jetbrains.pycharm-community-src direnv diff --git a/modules/development/emacs/default.nix b/modules/development/emacs/default.nix index da8387a..2e33218 100644 --- a/modules/development/emacs/default.nix +++ b/modules/development/emacs/default.nix @@ -47,7 +47,7 @@ in { # :lang latex & :lang org (latex previews) texlive.combined.scheme-medium # :lang nix - nixfmt-classic + nixfmt #nixd nil # :lang lisp diff --git a/modules/window-manager/hypr/default.nix b/modules/window-manager/hypr/default.nix index 26d8f96..25d4117 100644 --- a/modules/window-manager/hypr/default.nix +++ b/modules/window-manager/hypr/default.nix @@ -241,14 +241,9 @@ in { #"9, on-created-empty:[tiled] thunderbird" ]; - windowrulev2 = [ - "workspace 9, class:^(.*thunderbird.*)$" - "group, class:^(.*thunderbird.*)$" - "workspace 9, class:^(.*Element.*)$" - "group, class:^(.*Element.*)$" - "workspace 8, title:^(.*KeePassXC.*)$" - "float, class:^(.*steam.*)$" - "noinitialfocus,class:(jetbrains-)(.*),title:^win(.*), initialTitle:win.*, floating:1" + windowrule = [ + "workspace 8, match:title ^(.*KeePassXC.*)$" + #"noinitialfocus,match:class (jetbrains-)(.*),title:^win(.*), initialTitle:win.*, floating:1" ]; }; };