diff --git a/apps/de/default.nix b/apps/de/default.nix index a9af9e409e9e96a1b9462029611ece62b6cf2489..25c34e35131dfb70ccbda8ea2164784d9ddd55d4 100644 --- a/apps/de/default.nix +++ b/apps/de/default.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - imports = [ - ./gtk.nix - ]; + imports = [ ./gtk.nix ]; dconf.settings = let wallpaper = pkgs.fetchurl { diff --git a/apps/gui/default.nix b/apps/gui/default.nix index 19e99056f419f0f3ade964569cc56df7c0e866a4..ffb0a61d400785ec8f677fc1a924d9e32c2c28ea 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -5,7 +5,6 @@ ../nogui ./firefox.nix ./flameshot.nix ./ghostty.nix - ./niri.nix ./obs.nix ./spotify.nix ./wezterm.nix diff --git a/apps/gui/niri.nix b/apps/gui/niri.nix deleted file mode 100644 index ac36582078dc2ad70cf248db8da8f4c96b2dff2a..0000000000000000000000000000000000000000 --- a/apps/gui/niri.nix +++ /dev/null @@ -1,125 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - wofi - waybar - ]; - programs.niri = { - enable = true; - settings = { - input = { - #keyboard = { - # layout = "us"; - #}; - touchpad = { - tap = true; - natural-scroll = true; - }; - }; - - binds = { - "Mod+T" = { - action.spawn = "ghostty"; - }; - - # App launcher - "Mod+D" = { - action.spawn = [ - "wofi" - "--show" - "drun" - ]; - }; - - "Mod+Q" = { - action.close-window = { }; - }; - - "Mod+Shift+E" = { - action.quit = { }; - }; - - "Print" = { - action.spawn = "grim"; - }; - "Shift+Print" = { - action.spawn = [ - "sh" - "-c" - "grim -g \"$(slurp)\"" - ]; - }; - - "Mod+Left" = { - action.focus-column-left = { }; - }; - "Mod+Right" = { - action.focus-column-right = { }; - }; - "Mod+Up" = { - action.focus-window-up = { }; - }; - "Mod+Down" = { - action.focus-window-down = { }; - }; - - "Mod+Shift+Left" = { - action.move-column-left = { }; - }; - "Mod+Shift+Right" = { - action.move-column-right = { }; - }; - "Mod+Shift+Up" = { - action.move-window-up = { }; - }; - "Mod+Shift+Down" = { - action.move-window-down = { }; - }; - - "Mod+R" = { - action.switch-preset-column-width = { }; - }; - - "Mod+1" = { - action.focus-workspace = 1; - }; - "Mod+2" = { - action.focus-workspace = 2; - }; - "Mod+3" = { - action.focus-workspace = 3; - }; - "Mod+4" = { - action.focus-workspace = 4; - }; - - "Mod+Shift+1" = { - action.move-column-to-workspace = 1; - }; - "Mod+Shift+2" = { - action.move-column-to-workspace = 2; - }; - "Mod+Shift+3" = { - action.move-column-to-workspace = 3; - }; - "Mod+Shift+4" = { - action.move-column-to-workspace = 4; - }; - }; - - layout = { - gaps = 16; - center-focused-column = "never"; - }; - - window-rules = [ - { - matches = [ { app-id = "firefox"; } ]; - default-column-width = { - proportion = 0.5; - }; - } - ]; - }; - }; -} diff --git a/flake.lock b/flake.lock index f94fd6717ec5262899098722b75182641bf0e771..a3a1018b8c3076af27b1f5278c027f02d7d52677 100644 --- a/flake.lock +++ b/flake.lock @@ -120,62 +120,6 @@ "repo": "home-manager", "type": "github" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1750270605, - "narHash": "sha256-JfuuBGrM36I7KB9UID5urRvjHWWjFW//gMxQ5g9PrSo=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "da32eedd0d2c980fc90fe2b5cdd9080cc8c9f51f", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.05.1", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1750225787, - "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1747900541, @@ -208,22 +152,6 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1750133334, - "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "36ab78dab7da2e4e27911007033713bab534187b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733935885, @@ -257,22 +185,6 @@ "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1748190013, "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", @@ -288,7 +200,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1748190013, "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", @@ -304,7 +216,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1741037377, "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", @@ -320,7 +232,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -336,7 +248,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1743583204, "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", @@ -354,7 +266,7 @@ }, "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -373,7 +285,7 @@ } }, "pokego": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1741123315, @@ -396,9 +308,8 @@ "cfg": "cfg", "gomodinit": "gomodinit", "helix": "helix", "home-manager": "home-manager", - "niri": "niri", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nur": "nur", "pokego": "pokego", "spectre": "spectre", @@ -407,7 +318,7 @@ } }, "spectre": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1732207908, @@ -455,7 +366,7 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "utils": "utils" }, "locked": { @@ -508,39 +419,6 @@ }, "original": { "owner": "numtide", "repo": "flake-utils", - "type": "github" - } - }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.6", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1749315541, - "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", "type": "github" } } diff --git a/flake.nix b/flake.nix index 4b73e654f07113c23cb558eb1f202af47a16420e..04d9c1fdf43fbdfc4aa9fc78ff0e4a86cd70f261 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,6 @@ nixpkgs.follows = "nixpkgs"; }; }; nixos-hardware.url = "github:nixos/nixos-hardware/master"; - niri.url = "github:sodiboo/niri-flake"; nur.url = "github:nix-community/NUR"; helix.url = "git+https://git.jolheiser.com/helix.drv.git"; gomodinit.url = "git+https://git.jolheiser.com/gomodinit.git"; @@ -31,7 +30,6 @@ { nixpkgs, home-manager, nixos-hardware, - niri, agenix, ... }@inputs: @@ -105,10 +103,7 @@ overlays.default = overlay; homeConfigurations = { "jolheiser" = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = homeManagerModules ++ [ - niri.homeModules.niri - ./apps/de - ]; + modules = homeManagerModules ++ [ ./apps/de ]; }; }; nixosConfigurations = { @@ -116,7 +111,6 @@ "genmaicha" = nixpkgs.lib.nixosSystem { inherit system; modules = [ nixos-hardware.nixosModules.framework-13-7040-amd - niri.nixosModules.niri ./machines/genmaicha commonConfig ]; @@ -135,19 +129,4 @@ agenix.packages.${system}.agenix ]; }; }; - nixConfig = { - warn-dirty = false; - extra-experimental-features = [ - "nix-command" - "flakes" - ]; - extra-substituters = [ - "https://niri.cachix.org" - "https://jolheiser.cachix.org" - ]; - extra-trusted-public-keys = [ - "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" - "jolheiser.cachix.org-1:fiKkfTuHFqDK5ZOVxcqb4InUkKsrTvtMLISid7XvuVg=" - ]; - }; } diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix index 3330e35d21e9e6e87c971df5739744168195d8cb..907b59f29e089434d6f24f1494ed9b0eeb4546c4 100644 --- a/machines/common/gui/default.nix +++ b/machines/common/gui/default.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { - imports = [ - ../nogui - ]; + imports = [ ../nogui ]; security = { rtkit.enable = true; @@ -16,34 +14,19 @@ }; pulseaudio.enable = false; xserver = { enable = true; - displayManager.gdm = { - enable = true; - wayland = true; - }; + displayManager.lightdm.enable = true; + desktopManager.cinnamon.enable = true; xkb = { layout = "us"; variant = ""; }; }; }; - xdg.portal = { - enable = true; - wlr.enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; - }; - fonts.packages = with pkgs.nerd-fonts; [ hack iosevka jetbrains-mono monaspace ]; - environment.systemPackages = with pkgs; [ - tailscale-systray - grim - slurp - wl-clipboard - ]; + environment.systemPackages = [ pkgs.tailscale-systray ]; }