diff --git a/flake.lock b/flake.lock index a2ccbc5..7c491af 100644 --- a/flake.lock +++ b/flake.lock @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1774055499, - "narHash": "sha256-8Br5CVZQH0ZYf+yT1cmhqWN/qDzW9MxbMJRoUtZZMyY=", + "lastModified": 1774228817, + "narHash": "sha256-nN2A/pMSgS4yHQDjblLF9xk81g8OJ+rfynRk+UZmFso=", "owner": "AvengeMedia", "repo": "dms-plugin-registry", - "rev": "3aad8d18fad8688ecb85074f8d276c80b9ee6a17", + "rev": "f2b0aed92651c90d5f158620fae3a85caaa5931f", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1773963144, - "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", + "lastModified": 1774274588, + "narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a91b3ea73a765614d90360580b689c48102d1d33", + "rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1774063450, - "narHash": "sha256-p1Y2iUsWyLKk1z35OdAGcEpmbpRTG3AgjdyAVh5kmc8=", + "lastModified": 1774286543, + "narHash": "sha256-p/uG7RgY9JfE7YUgDHZ1FlHONpoPuPIb+PwOEdcPBRE=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "71c3b957aeb56aea79fd9a964e3f0bff2b794251", + "rev": "94da705b8baa5c78d39e8c092bccfbe3a015b8de", "type": "github" }, "original": { @@ -468,11 +468,11 @@ ] }, "locked": { - "lastModified": 1773774022, - "narHash": "sha256-s+EMBn+DlJmMH+ZUp+MrqnAaIomR9q+1xAyHMVF5HGE=", + "lastModified": 1774270213, + "narHash": "sha256-rY+4HBblbqfzYakeFvNabHIBHly+9a5WlH1c/yWHD0w=", "owner": "natsukium", "repo": "mcp-servers-nix", - "rev": "411638cb2dae8e93415806340f3e7432ee09b8fd", + "rev": "551896cdef07eb3c4175175dbc4cebdd2daf5c5b", "type": "github" }, "original": { @@ -537,11 +537,11 @@ ] }, "locked": { - "lastModified": 1773889880, - "narHash": "sha256-cu23CGP+mD2wKPKaoGM7evZ1dXfjd+cjryqqqx2HloE=", + "lastModified": 1774283383, + "narHash": "sha256-3aCfmL8hOcdIl783LTnK+lHcjMGCnc+2zQ98xUyefCU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "63767d4572eb2e3da5e68f68de77d8f2cdeca8dd", + "rev": "8a583029606cf072cc01c7e2f4298cc75a7ada28", "type": "github" }, "original": { @@ -640,11 +640,11 @@ ] }, "locked": { - "lastModified": 1774013813, - "narHash": "sha256-gaKNu+dW6lA4LU8PM4pNqmaqoY8hIggM7ticP6VjVFk=", + "lastModified": 1774233978, + "narHash": "sha256-rT9wnIfbI1gjl0gq4nN8/5ZvFWn+K6QLwlyy6Gx8FDc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "342bd5c65526d57b7bed200c8219d1a48414c806", + "rev": "4a583dd427ccf7d912282909a2702a6a547d8560", "type": "github" }, "original": { @@ -660,11 +660,11 @@ ] }, "locked": { - "lastModified": 1773552174, - "narHash": "sha256-mHSRNrT1rjeYBgkAlj07dW3+1nFEgAd8Gu6lgyfT9DU=", + "lastModified": 1774156144, + "narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "8faeb68130df077450451b6734a221ba0d6cde42", + "rev": "55b588747fa3d7fc351a11831c4b874dab992862", "type": "github" }, "original": { @@ -749,11 +749,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773814637, - "narHash": "sha256-mzgnItm0yK1PcmhALIWc5v2iZCuYjKdgKJ+vo7XhbHY=", - "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", + "lastModified": 1774244481, + "narHash": "sha256-mw80nQK4uJ8wJWiQnZ32j/BQlRx4QByvli8EP7/2hGE=", + "rev": "4590696c8693fea477850fe379a01544293ca4e2", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.7766.fea3b367d61c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/25.11/nixos-25.11.8023.4590696c8693/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -762,11 +762,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-p0tPeJJbg+PKaH741F1CWa9Bf9vf6g02HK9V/g4TkHo=", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "lastModified": 1774106199, + "narHash": "sha256-n6Edjl/GL8HQ5SURLc7yE3qAb1hf+9ues8aNtHZnjTA=", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre964859.b40629efe5d6/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre967235.6c9a78c09ff4/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -783,11 +783,11 @@ ] }, "locked": { - "lastModified": 1774086764, - "narHash": "sha256-RC5/86A51KqVPMUTK9DtVy6DkCk538yyk+erJwIkoSs=", + "lastModified": 1774291333, + "narHash": "sha256-rinUvFexsIdC0r4R27Veod/GR7C6BspXRiypExKDM/0=", "owner": "nix-community", "repo": "NUR", - "rev": "4874dec9b7f1e7c17293593917d499a411706a12", + "rev": "6cb11864218f51ec1e5f80c02654dc0e4d3cb42b", "type": "github" }, "original": { @@ -917,11 +917,11 @@ ] }, "locked": { - "lastModified": 1773889674, - "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=", + "lastModified": 1774154798, + "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5", + "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", "type": "github" }, "original": { @@ -957,11 +957,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773790548, - "narHash": "sha256-6lI+ZM1yWL4cNRT39s8AUC+kwq237PZCrWc1ubLOwqc=", + "lastModified": 1774194089, + "narHash": "sha256-SCczWhr8y8aaXVHG+gOGcRahNb0BU1Z5zYZuv9W/nA8=", "owner": "nix-community", "repo": "stylix", - "rev": "e8ffdddd42062ebc90178db9d013aa38c20b7b2f", + "rev": "7c34241d80ea64dd2039bb3a786fb66b4c6261d9", "type": "github" }, "original": { diff --git a/nix/flake/cachix.nix b/nix/flake/cachix.nix index 3cd8d45..9309468 100644 --- a/nix/flake/cachix.nix +++ b/nix/flake/cachix.nix @@ -23,6 +23,7 @@ in ilkecan = concatLists [ (filter isPatchedInput (attrValues inputs)) (mapAttrsToList (_: v: v.apps.ci.program) config.allSystems) + (concatLists (mapAttrsToList (_: v: attrValues v.checks) config.allSystems)) ]; }; }; diff --git a/nix/modules/flake/cachix-push.nix b/nix/modules/flake/cachix-push.nix index 7a88acb..2483918 100644 --- a/nix/modules/flake/cachix-push.nix +++ b/nix/modules/flake/cachix-push.nix @@ -7,6 +7,7 @@ let inherit (lib) concatStringsSep + filter getExe mapAttrsToList mkIf @@ -20,6 +21,14 @@ let inherit (drv) meta; }; + mkCachixPush = + cache: objects: + let + pureObjects = filter (x: !x ? __impure) objects; + paths = map toString pureObjects; + in + "cachix push ${cache} ${concatStringsSep " " paths}"; + cfg = config.flake.cachix; in { @@ -42,11 +51,7 @@ in pkgs.writeShellApplication { name = "cachix-push"; runtimeInputs = [ pkgs.cachix ]; - text = concatStringsSep "\n" ( - mapAttrsToList ( - cache: paths: "cachix push ${cache} ${concatStringsSep " " (map toString paths)}" - ) cfg.push - ); + text = concatStringsSep "\n" (mapAttrsToList mkCachixPush cfg.push); } ); }; diff --git a/nix/users/ilkecan/dotfiles/.config/niri/dms/outputs.kdl b/nix/users/ilkecan/dotfiles/.config/niri/dms/outputs.kdl index 00a7236..1f453f1 100644 --- a/nix/users/ilkecan/dotfiles/.config/niri/dms/outputs.kdl +++ b/nix/users/ilkecan/dotfiles/.config/niri/dms/outputs.kdl @@ -1,18 +1,18 @@ output "eDP-1" { mode "1920x1200@60.003" - scale 1.25 + scale 1 position x=0 y=0 } output "DP-3" { mode "3840x2160@120.000" scale 2 - position x=-1920 y=-120 + position x=-1920 y=60 focus-at-startup } output "HDMI-A-1" { mode "1920x1080@60.000" scale 1 - position x=-192 y=-1080 + position x=0 y=-1080 } diff --git a/nix/users/ilkecan/multimedia/video.nix b/nix/users/ilkecan/multimedia/video.nix index ca82adf..5c31ea3 100644 --- a/nix/users/ilkecan/multimedia/video.nix +++ b/nix/users/ilkecan/multimedia/video.nix @@ -8,7 +8,7 @@ ffmpeg-full gpu-screen-recorder gpu-screen-recorder-gtk - unstable.stremio-linux-shell + stremio-linux-shell vlc ]; diff --git a/nix/users/ilkecan/wayland/niri/autostart.nix b/nix/users/ilkecan/wayland/niri/autostart.nix index ee3382f..25d5226 100644 --- a/nix/users/ilkecan/wayland/niri/autostart.nix +++ b/nix/users/ilkecan/wayland/niri/autostart.nix @@ -8,6 +8,10 @@ let homeDirectory ; + inherit (config.xdg) + userDirs + ; + githubDir = "${homeDirectory}/repos/git/github.com"; in { @@ -44,7 +48,7 @@ in { argv = [ "nautilus" - homeDirectory + userDirs.download ]; } { diff --git a/nix/users/ilkecan/wayland/niri/window-rules.nix b/nix/users/ilkecan/wayland/niri/window-rules.nix index b521d55..8c08938 100644 --- a/nix/users/ilkecan/wayland/niri/window-rules.nix +++ b/nix/users/ilkecan/wayland/niri/window-rules.nix @@ -95,10 +95,14 @@ } { matches = [ { app-id = ''^steam_app_\d*$''; } ]; - block-out-from = "screen-capture"; open-maximized = true; open-on-workspace = "gaming"; } + { + matches = [ { app-id = ''^steam_app_\d*$''; } ]; + excludes = [ { app-id = "^steam_app_1973530$"; } ]; + block-out-from = "screen-capture"; + } { matches = [ { app-id = "^thunderbird$"; } ]; block-out-from = "screen-capture";