diff options
| -rw-r--r-- | config/shared.nix | 2 | ||||
| -rw-r--r-- | flake.lock | bin | 25810 -> 25810 bytes | |||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home-manager/common.nix | 2 | ||||
| -rw-r--r-- | home-manager/compositor/hyprland.nix | 54 | ||||
| -rw-r--r-- | hosts/tarrel.nix | 7 |
6 files changed, 33 insertions, 36 deletions
diff --git a/config/shared.nix b/config/shared.nix index 2ea76c8..91f9b34 100644 --- a/config/shared.nix +++ b/config/shared.nix @@ -62,7 +62,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.hyprland}/bin/hyprland"; + command = "${pkgs.hyprland}/bin/Hyprland"; user = "jras"; }; }; Binary files differ@@ -2,9 +2,9 @@ description = "NixOS Flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; helix.url = "github:helix-editor/helix/master"; diff --git a/home-manager/common.nix b/home-manager/common.nix index c72c80f..686b678 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -240,7 +240,7 @@ padding = { x = 5; y = 2; }; }; env = { TERM = "alacritty-direct"; }; - shell = { + terminal.shell = { program = "${pkgs.zsh}/bin/zsh"; args = [ "-l" ]; }; diff --git a/home-manager/compositor/hyprland.nix b/home-manager/compositor/hyprland.nix index dcd1d91..2657d33 100644 --- a/home-manager/compositor/hyprland.nix +++ b/home-manager/compositor/hyprland.nix @@ -14,7 +14,7 @@ in # Required for hyprpicker's cursor but also seems to fix some icons for astal home.pointerCursor = { gtk.enable = true; - package = pkgs.gnome.adwaita-icon-theme; + package = pkgs.adwaita-icon-theme; name = "Adwaita"; size = 16; }; @@ -25,9 +25,9 @@ in wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.systemd.enable = true; - wayland.windowManager.hyprland.plugins = with pkgs; [ - hyprlandPlugins.hy3 - ]; + # wayland.windowManager.hyprland.plugins = with pkgs; [ + # hyprlandPlugins.hy3 + # ]; wayland.windowManager.hyprland.settings = { "$terminal" = "alacritty"; @@ -42,7 +42,7 @@ in }; general = { - "layout" = "hy3"; + # "layout" = "hy3"; "border_size" = 2; "col.active_border" = "rgba(fe8423ee) rgba(e11701ee) 45deg"; "col.inactive_border" = "rgba(595959aa)"; @@ -91,48 +91,48 @@ in bind = [ "$mod, Return, exec, alacritty" - "$mod, Semicolon, hy3:makegroup, h" + # "$mod, Semicolon, hy3:makegroup, h" "$mod, D, exec, ${pkgs.rofi-wayland-unwrapped}/bin/rofi -show drun" "$mod, F, fullscreen, 1" - "$mod, H, hy3:movefocus, l" - "$mod, J, hy3:movefocus, d" - "$mod, K, hy3:movefocus, u" - "$mod, L, hy3:movefocus, r" + # "$mod, H, hy3:movefocus, l" + # "$mod, J, hy3:movefocus, d" + # "$mod, K, hy3:movefocus, u" + # "$mod, L, hy3:movefocus, r" "$mod, P, exec, ${pkgs.grimblast}/bin/grimblast copy area" "$mod, Q, exec, ${pkgs.hyprlock}/bin/hyprlock" - "$mod, V, hy3:makegroup, v" - "$mod, W, hy3:changegroup, toggletab" + # "$mod, V, hy3:makegroup, v" + # "$mod, W, hy3:changegroup, toggletab" "$mod, X, movecurrentworkspacetomonitor, +1" "$mod SHIFT, C, exec, ${pkgs.hyprpicker}/bin/hyprpicker -a -f hex" "$mod SHIFT, D, exec, ${pkgs.rofi-rbw-wayland}/bin/rofi-rbw" - "$mod SHIFT, H, hy3:movewindow, l" - "$mod SHIFT, J, hy3:movewindow, d" - "$mod SHIFT, K, hy3:movewindow, u" - "$mod SHIFT, L, hy3:movewindow, r" + # "$mod SHIFT, H, hy3:movewindow, l" + # "$mod SHIFT, J, hy3:movewindow, d" + # "$mod SHIFT, K, hy3:movewindow, u" + # "$mod SHIFT, L, hy3:movewindow, r" "$mod SHIFT, P, exec, ${pkgs.grimblast}/bin/grimblast copy screen" - "$mod SHIFT, Q, hy3:killactive" + # "$mod SHIFT, Q, hy3:killactive" ] ++ ( builtins.concatLists (builtins.genList (i: let ws = i + 1; in [ "$mod, code:1${toString i}, workspace, ${toString ws}" - "$mod SHIFT, code:1${toString i}, hy3:movetoworkspace, ${toString ws}" + # "$mod SHIFT, code:1${toString i}, hy3:movetoworkspace, ${toString ws}" ] ) 9) ); - plugin = { - hy3 = { - tabs = { - "col.active" = "0xFFFE8423"; - "col.inactive" = "0xFF103543"; - "col.text.inactive" = "0xFFFECDB2"; - }; - }; - }; + # plugin = { + # hy3 = { + # tabs = { + # "col.active" = "0xFFFE8423"; + # "col.inactive" = "0xFF103543"; + # "col.text.inactive" = "0xFFFECDB2"; + # }; + # }; + # }; }; programs.waybar.enable = true; diff --git a/hosts/tarrel.nix b/hosts/tarrel.nix index 3784873..96dd693 100644 --- a/hosts/tarrel.nix +++ b/hosts/tarrel.nix @@ -10,12 +10,13 @@ discord ]; - hardware.opengl.enable = true; + hardware.graphics.enable = true; services.xserver.videoDrivers = ["nvidia"]; hardware.nvidia = { modesetting.enable = true; nvidiaSettings = true; nvidiaPersistenced = true; + open = true; package = config.boot.kernelPackages.nvidiaPackages.stable; }; @@ -58,10 +59,6 @@ environment.pathsToLink = [ "/libexec" ]; - services.unifi = { - enable = true; - unifiPackage = pkgs.unifi8; - }; services.sunshine = { enable = true; autoStart = true; |