diff options
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | hosts/jonbox/default.nix | 22 | ||||
| -rw-r--r-- | modules/desktop/apps/editors/vscode.nix | 5 | ||||
| -rw-r--r-- | modules/desktop/hyprland.nix | 6 | ||||
| -rw-r--r-- | modules/hardware/audio.nix | 22 | ||||
| -rw-r--r-- | modules/hardware/bluetooth.nix | 2 | ||||
| -rw-r--r-- | modules/hardware/gpu.nix | 36 | ||||
| -rw-r--r-- | modules/options.nix | 1 | ||||
| -rw-r--r-- | overlay.nix | 2 |
9 files changed, 58 insertions, 68 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1720926593, - "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", + "lastModified": 1728790083, + "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", + "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", "type": "github" }, "original": { @@ -40,11 +40,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1720954236, - "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/hosts/jonbox/default.nix b/hosts/jonbox/default.nix index 2804902..cf6ad64 100644 --- a/hosts/jonbox/default.nix +++ b/hosts/jonbox/default.nix @@ -3,7 +3,8 @@ lib, pkgs, ... -}: { + }: { + hardware.enableAllFirmware = true; #Filesystems fileSystems."/" = { device = "/dev/disk/by-uuid/83cafaff-8be3-477f-b13c-c47dafdf969d"; @@ -17,17 +18,17 @@ }; fileSystems."/mnt/jonshare" = { - device = "homenas:/var/data/jon"; + device = "192.168.0.145:/var/data/jon"; fsType = "nfs"; }; fileSystems."/mnt/plexshare" = { - device = "homenas:/var/data/plex"; + device = "192.168.0.145:/var/data/plex"; fsType = "nfs"; }; fileSystems."/mnt/share" = { - device = "homenas:/var/data/shared"; + device = "192.168.0.145:/var/data/shared"; fsType = "nfs"; }; @@ -91,10 +92,15 @@ #services.clamav.daemon.enable = true; #services.clamav.updater.enable = true; - home.manager.wayland.windowManager.hyprland.extraConfig = '' - monitor=DP-2,1920x1080,0x0,1 - monitor=HDMI-A-2,1920x1080,1920x0,1 - ''; + home.manager.wayland.windowManager.hyprland.settings = { + cursor = { + no_hardware_cursors = true; + }; + monitor = [ + "HDMI-A-1,1920x1080,0x0,1" + "DP-1,1920x1080,1920x0,1" + ]; + }; programs.nix-ld.enable = true; programs.nix-index.enableZshIntegration = false; diff --git a/modules/desktop/apps/editors/vscode.nix b/modules/desktop/apps/editors/vscode.nix index 39c6e03..23bf15d 100644 --- a/modules/desktop/apps/editors/vscode.nix +++ b/modules/desktop/apps/editors/vscode.nix @@ -18,10 +18,9 @@ in { config = lib.mkIf (codeConf.enable) { home.manager.programs.vscode = { enable = true; - package = pkgs.vscode.fhs; extensions = with pkgs.vscode-extensions; [ - catppuccin.catppuccin-vsc - catppuccin.catppuccin-vsc-icons + catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons + ms-dotnettools.csharp ]; }; }; diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 134d52f..678a97f 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -108,9 +108,6 @@ in { config = lib.mkIf (hyprlandConf.enable) (lib.mkMerge [ { - environment.variables.WLR_NO_HARDWARE_CURSORS = "1"; - environment.sessionVariables.NIXOS_OZONE_WL = "1"; - home.packages = [ pkgs.killall pkgs.wl-clipboard @@ -142,6 +139,7 @@ in { config.common.default = ["wlr" "gtk" "hyprland" ]; }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; home.manager.wayland.windowManager.hyprland = { enable = true; xwayland.enable = hyprlandConf.xwayland; @@ -196,7 +194,7 @@ in { ]) ( lib.mkIf (config.modules.device.gpu == "nvidia") [ - "GBM_BACKEND,nvidia" + "GBM_BACKEND,nvidia" "__GLX_VENDOR_LIBRARY_NAME,nvidia" "LIBVA_DRIVER_NAME,nvidia" "NVD_BACKEND,direct" diff --git a/modules/hardware/audio.nix b/modules/hardware/audio.nix index 3ffa32a..a674597 100644 --- a/modules/hardware/audio.nix +++ b/modules/hardware/audio.nix @@ -23,22 +23,18 @@ in { alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; + + wireplumber.extraConfig.bluetoothEnhancements = { + "monitor.bluez.properties" = { + "bluez5.enable-sbc-xq" = true; + "bluez5.enable-msbc" = true; + "bluez5.enable-hw-volume" = true; + }; + }; }; user.extraGroups = ["audio"]; home.packages = [pkgs.pavucontrol]; - } - (lib.mkIf (device.hasBluetooth) { - home.configFile = { - "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - bluez_monitor.properties = { - ["bluez5.enable-sbc-xq"] = true, - ["bluez5.enable-msbc"] = true, - ["bluez5.enable-hw-volume"] = true, - ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - } - ''; - }; - }) + } ]); } diff --git a/modules/hardware/bluetooth.nix b/modules/hardware/bluetooth.nix index 7f835bf..c5da0fa 100644 --- a/modules/hardware/bluetooth.nix +++ b/modules/hardware/bluetooth.nix @@ -18,9 +18,9 @@ in { config = lib.mkIf (bluetoothConfig.enable && device.hasBluetooth) { hardware.bluetooth = { enable = true; - package = pkgs.bluez; powerOnBoot = true; }; + services.blueman.enable = true; user.extraGroups = ["bluetooth"]; }; } diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix index bb8b831..8d2f004 100644 --- a/modules/hardware/gpu.nix +++ b/modules/hardware/gpu.nix @@ -36,31 +36,21 @@ in { environment.variables.VDPAU_DRIVER = "va_gl"; }) (lib.mkIf (device.gpu == "nvidia") { - boot = { - extraModulePackages = [ - config.boot.kernelPackages.nvidia_x11_beta - ]; - initrd.kernelModules = [ - "nvidia" - "nvidia_modeset" - "nvidia_uvm" - "nvidia_drm" - ]; - blacklistedKernelModules = [ "nouveau" ]; - }; + services.xserver.videoDrivers = ["nvidia"]; + boot.initrd.kernelModules = [ "nvidia" ]; - environment.systemPackages = with pkgs; [ - pkgs.nvidia-vaapi-driver - ]; + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = false; + nvidiaSettings = true; + package = config.boot.kernelPackages.nvidiaPackages.latest; + }; - services.xserver.videoDrivers = ["nvidia"]; - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; - }; + environment.systemPackages = with pkgs; [ + nvtopPackages.nvidia + ]; }) ]); } diff --git a/modules/options.nix b/modules/options.nix index e429171..c2463b4 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -95,6 +95,7 @@ # home manager configuration home-manager = { useUserPackages = true; + useGlobalPkgs = true; users.${config.user.name} = lib.mkAliasDefinitions options.home.manager; }; diff --git a/overlay.nix b/overlay.nix index d79b87c..6d748e1 100644 --- a/overlay.nix +++ b/overlay.nix @@ -2,7 +2,7 @@ inputs, system, ... -}: final: prev: { + }: final: prev: { stable = import inputs.nixpkgs-stable { inherit system; config.allowUnfree = true; |