wallsocket: put niri config behind a specialisation for now

+67 -24

flake.lock

··· 1 1 { 2 2 "nodes": { 3 + "ags": { 4 + "inputs": { 5 + "astal": "astal", 6 + "nixpkgs": [ 7 + "nixpkgs" 8 + ] 9 + }, 10 + "locked": { 11 + "lastModified": 1738087375, 12 + "narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=", 13 + "owner": "Aylur", 14 + "repo": "ags", 15 + "rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4", 16 + "type": "github" 17 + }, 18 + "original": { 19 + "owner": "Aylur", 20 + "repo": "ags", 21 + "type": "github" 22 + } 23 + }, 24 + "astal": { 25 + "inputs": { 26 + "nixpkgs": [ 27 + "ags", 28 + "nixpkgs" 29 + ] 30 + }, 31 + "locked": { 32 + "lastModified": 1737670815, 33 + "narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=", 34 + "owner": "aylur", 35 + "repo": "astal", 36 + "rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042", 37 + "type": "github" 38 + }, 39 + "original": { 40 + "owner": "aylur", 41 + "repo": "astal", 42 + "type": "github" 43 + } 44 + }, 3 45 "flake-utils": { 4 46 "inputs": { 5 47 "systems": "systems" ··· 58 100 ] 59 101 }, 60 102 "locked": { 61 - "lastModified": 1740796616, 62 - "narHash": "sha256-JU97wIfRxeFN6rpTsUVCwWAdix+Wka4Or23907YIrFI=", 103 + "lastModified": 1741461731, 104 + "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=", 63 105 "owner": "nix-community", 64 106 "repo": "home-manager", 65 - "rev": "f0b5e7e8a75abdea32bbff09ddd7b6eeb4b9b445", 107 + "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44", 66 108 "type": "github" 67 109 }, 68 110 "original": { ··· 139 181 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 140 182 }, 141 183 "locked": { 142 - "lastModified": 1740817768, 143 - "narHash": "sha256-NFu4LhDHkc4xonmpknh2cI/0ozeXjFmoMxVz1HecqxI=", 184 + "lastModified": 1741472692, 185 + "narHash": "sha256-OtZauVXHD7Q2ptcLrEJABfU+wL2cfz7qCKfebL8BlJE=", 144 186 "owner": "sodiboo", 145 187 "repo": "niri-flake", 146 - "rev": "f3dde1ed6d76545ac637a80a356d50f6a7089a2a", 188 + "rev": "d5e517fd6b3c930a369bc81a0402a8d7eec956a6", 147 189 "type": "github" 148 190 }, 149 191 "original": { ··· 172 214 "niri-unstable": { 173 215 "flake": false, 174 216 "locked": { 175 - "lastModified": 1740749946, 176 - "narHash": "sha256-uA03y5H8XI00ZxOIAAj3RGGOBOQCFjLyjLc79NH01oI=", 217 + "lastModified": 1741459657, 218 + "narHash": "sha256-FalBBKrwu+YfGaNOsUTT4wzGWwx6EH+TkkRJV9TZjE8=", 177 219 "owner": "YaLTeR", 178 220 "repo": "niri", 179 - "rev": "66113d7d76f6cf7d06e2ccde9281ff9bafab126c", 221 + "rev": "69627bdc64d8891befff95e807869416658d36c6", 180 222 "type": "github" 181 223 }, 182 224 "original": { ··· 192 234 ] 193 235 }, 194 236 "locked": { 195 - "lastModified": 1740755725, 196 - "narHash": "sha256-amZbqP84H/ApugaT+TADXTB3NbjkVHI9Vac1saIk0kE=", 237 + "lastModified": 1741229100, 238 + "narHash": "sha256-0HwrTDXp9buEwal/1ymK9uQmzUD5ozIA7CJGqnT/gLs=", 197 239 "owner": "LnL7", 198 240 "repo": "nix-darwin", 199 - "rev": "5d6e0851b60508cffd66b4a6982440a40720338d", 241 + "rev": "adf5c88ba1fe21af5c083b4d655004431f20c5ab", 200 242 "type": "github" 201 243 }, 202 244 "original": { ··· 212 254 ] 213 255 }, 214 256 "locked": { 215 - "lastModified": 1740281615, 216 - "narHash": "sha256-dZWcbAQ1sF8oVv+zjSKkPVY0ebwENQEkz5vc6muXbKY=", 257 + "lastModified": 1741446546, 258 + "narHash": "sha256-0z0GiUsUhjhZWa24bcAxqmlI3Ch8QvEeh42wghc6oVw=", 217 259 "owner": "nix-community", 218 260 "repo": "nix-index-database", 219 - "rev": "465792533d03e6bb9dc849d58ab9d5e31fac9023", 261 + "rev": "eeaf10849c3a0435323216885c0df7569dc95cb9", 220 262 "type": "github" 221 263 }, 222 264 "original": { ··· 227 269 }, 228 270 "nixpkgs": { 229 271 "locked": { 230 - "lastModified": 1740695751, 231 - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", 272 + "lastModified": 1741379970, 273 + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", 232 274 "owner": "nixos", 233 275 "repo": "nixpkgs", 234 - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", 276 + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", 235 277 "type": "github" 236 278 }, 237 279 "original": { ··· 243 285 }, 244 286 "nixpkgs-stable": { 245 287 "locked": { 246 - "lastModified": 1740743217, 247 - "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=", 288 + "lastModified": 1741332913, 289 + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", 248 290 "owner": "NixOS", 249 291 "repo": "nixpkgs", 250 - "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c", 292 + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", 251 293 "type": "github" 252 294 }, 253 295 "original": { ··· 259 301 }, 260 302 "root": { 261 303 "inputs": { 304 + "ags": "ags", 262 305 "home-manager": "home-manager", 263 306 "iosevka-solai": "iosevka-solai", 264 307 "lix-module": "lix-module", ··· 318 361 "xwayland-satellite-unstable": { 319 362 "flake": false, 320 363 "locked": { 321 - "lastModified": 1739246919, 322 - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", 364 + "lastModified": 1741140299, 365 + "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=", 323 366 "owner": "Supreeeme", 324 367 "repo": "xwayland-satellite", 325 - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", 368 + "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d", 326 369 "type": "github" 327 370 }, 328 371 "original": {

+19 -2

flake.nix

··· 1 1 { 2 - description = "Home Manager configuration of ovy"; 3 - 4 2 inputs = { 5 3 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; 6 4 # nur.url = "github:nix-community/NUR"; ··· 34 32 url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; 35 33 inputs.nixpkgs.follows = "nixpkgs"; 36 34 }; 35 + 36 + ags = { 37 + url = "github:Aylur/ags"; 38 + inputs.nixpkgs.follows = "nixpkgs"; 39 + }; 37 40 }; 38 41 39 42 outputs = { 43 + ags, 40 44 home-manager, 41 45 lix-module, 42 46 niri-flake, 43 47 nix-darwin, 44 48 nix-index-database, 45 49 nixpkgs, 50 + self, 46 51 ... 47 52 } @ inputs: let 48 53 system = "x86_64-linux"; 49 54 pkgs = nixpkgs.legacyPackages.${system}; 55 + agsPkgs = ags.packages.${system}; 50 56 in { 51 57 packages.${system} = { 52 58 iconifydl = pkgs.callPackage ./pkgs/iconifydl.nix {}; 59 + 60 + default = ags.lib.bundle { 61 + inherit pkgs; 62 + src = ./files/astal; 63 + name = "ovy-shell"; 64 + entry = "app.ts"; 65 + }; 66 + }; 67 + 68 + devShells.x86_64-linux.default = pkgs.mkShell { 69 + buildInputs = [agsPkgs.agsFull agsPkgs.io agsPkgs.apps agsPkgs.tray self.packages.${system}.iconifydl]; 53 70 }; 54 71 55 72 nixosConfigurations.wallsocket = nixpkgs.lib.nixosSystem {

+14 -6

home/modules/niri.nix

··· 12 12 # variant = "colemak"; 13 13 # }; 14 14 15 + # TODO: maybe explicitly define outputs 16 + 15 17 input.mouse = { 16 18 natural-scroll = false; 17 19 accel-profile = "flat"; ··· 40 42 41 43 layout = { 42 44 struts = let 43 - x = 32; 44 - y = 32; 45 + x = 16; 46 + y = 16; 45 47 in { 46 48 top = y; 47 49 bottom = y; ··· 59 61 relative-to = "workspace-view"; 60 62 }; 61 63 }; 64 + 65 + shadow.enable = true; 62 66 }; 63 67 64 68 window-rules = [ ··· 74 78 clip-to-geometry = true; 75 79 draw-border-with-background = false; 76 80 } 81 + { 82 + matches = [{app-id = "^1Password$";}]; 83 + open-floating = true; 84 + } 77 85 ]; 78 86 79 87 # TODO: create custom keybinds on layer 1 so I don't need to use a fuckton of fingers ··· 84 92 "Mod+Q".action = close-window; 85 93 86 94 # Quick access 87 - "Mod+T".action = spawn "kitty"; # TODO: backtick instead? 95 + "Mod+Grave".action = spawn "kitty"; 88 96 "Mod+B".action = spawn "vivaldi"; # TODO: spawn on startup instead 89 97 "Mod+R".action = spawn "fuzzel"; 90 98 91 - # "Print".action = screenshot; 92 - # "Ctrl+Print".action = screenshot-screen; 93 - # "Alt+Print".action = screenshot-window; 99 + "Print".action = screenshot; 100 + "Ctrl+Print".action = screenshot-screen; 101 + "Alt+Print".action = screenshot-window; 94 102 95 103 # Resizing 96 104 "Mod+F".action = maximize-column;

+6 -2

home/wallsocket.nix

··· 1 - {pkgs, ...}: { 1 + { 2 + pkgs, 3 + inputs, 4 + ... 5 + }: { 2 6 imports = [ 3 7 ./desktop/apps.nix 4 8 ./modules/espanso.nix ··· 23 27 }; 24 28 25 29 # Temporary location for these 26 - home.packages = with pkgs; [ags inotify-tools]; 30 + home.packages = [pkgs.inotify-tools inputs.ags.packages.${pkgs.system}.default]; 27 31 28 32 home.sessionVariables.DOCKER_HOST = "unix:///run/user/1000/podman/podman.sock"; 29 33

+20 -12

nixos/wallsocket/configuration.nix

··· 1 1 { 2 + lib, 3 + inputs, 2 4 pkgs, 3 - inputs, 4 5 ... 5 6 }: { 6 7 imports = [ 7 8 ./bluetooth.nix 8 9 ./graphics.nix 9 - # ./niri.nix 10 10 ./hardware-configuration.nix 11 11 ../../modules/nixpkgs.nix 12 12 ]; 13 13 14 + specialisation.niri.configuration = { 15 + system.nixos.tags = ["niri"]; 16 + imports = [./niri.nix]; 17 + 18 + services.displayManager.enable = false; 19 + services.displayManager.sddm.enable = false; 20 + services.displayManager.sddm.wayland.enable = false; 21 + # services.displayManager.defaultSession = lib.mkDefault "plasma"; 22 + services.desktopManager.plasma6.enable = false; 23 + }; 24 + 14 25 # Bootloader. 15 26 boot.loader.systemd-boot.enable = true; 16 27 boot.loader.efi.canTouchEfiVariables = true; ··· 18 29 boot.kernel.sysctl."fs.file-max" = 2147483642; 19 30 20 31 networking.hostName = "wallsocket"; 21 - 22 - # Enable networking 23 32 networking.networkmanager.enable = true; 24 33 25 - # Set your time zone. 34 + # i18n & time 26 35 time.timeZone = "Australia/Melbourne"; 27 - 28 - # Select internationalisation properties. 29 36 i18n.defaultLocale = "en_GB.UTF-8"; 30 37 31 38 i18n.extraLocaleSettings = { ··· 41 48 }; 42 49 43 50 # Enable the KDE Plasma Desktop Environment. 44 - services.displayManager.enable = true; 45 - services.displayManager.sddm.enable = true; 46 - services.displayManager.sddm.wayland.enable = true; 47 - services.displayManager.defaultSession = "plasma"; # Set to `plasma` for Wayland. 48 - services.desktopManager.plasma6.enable = true; 51 + services.displayManager.enable = lib.mkDefault true; 52 + services.displayManager.sddm.enable = lib.mkDefault true; 53 + services.displayManager.sddm.wayland.enable = lib.mkDefault true; 54 + services.displayManager.defaultSession = lib.mkDefault "plasma"; # Set to `plasma` for Wayland. 55 + services.desktopManager.plasma6.enable = lib.mkDefault true; 49 56 50 57 environment.plasma6.excludePackages = with pkgs.kdePackages; [ 51 58 elisa ··· 93 100 dates = "weekly"; 94 101 }; 95 102 103 + environment.sessionVariables."NIXOS_OZONE_WL" = 1; 96 104 environment.sessionVariables."MOZ_ENABLE_WAYLAND" = 0; 97 105 environment.systemPackages = with pkgs; [ 98 106 adwaita-icon-theme

+9 -12

nixos/wallsocket/niri.nix

··· 1 1 {pkgs, ...}: { 2 - # TODO: do i need this? 3 - # security.pam.services.<WHAT>.kwallet.enable = true; 4 - 5 2 programs.niri = { 6 3 enable = true; 7 4 package = pkgs.niri; 8 5 }; 9 6 10 7 # TODO: qtgreet? https://gitlab.com/marcusbritanicus/QtGreet 11 - # services.greetd = { 12 - # enable = true; 13 - # settings = { 14 - # default_session = { 15 - # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session -r --window-padding 4"; 16 - # user = "greeter"; 17 - # }; 18 - # }; 19 - # }; 8 + services.greetd = { 9 + enable = true; 10 + settings = { 11 + default_session = { 12 + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session -r --window-padding 4"; 13 + user = "greeter"; 14 + }; 15 + }; 16 + }; 20 17 21 18 environment.systemPackages = with pkgs; [ 22 19 wl-clipboard

Configure Feed

Configure Feed