diff --git a/flake.lock b/flake.lock index 0a789cd..4f4f611 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ ] }, "locked": { - "lastModified": 1717316182, - "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1717419189, - "narHash": "sha256-3J6GHIbA0f/bkHc7qxe1JlpgHJFawuC2ZNepYAjToQM=", + "lastModified": 1717593209, + "narHash": "sha256-Hc8yIj1CDuVOpUV13ZWvR+5CPXysBmuUqqB8bJ7/CgQ=", "owner": "danth", "repo": "stylix", - "rev": "c760f63a44a98b2324fdebaee32831b1297172a1", + "rev": "1d3826ceed91ae67562f28ee2e135813a11e47a6", "type": "github" }, "original": { diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 594e44c..1efef98 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -37,9 +37,9 @@ in { ${pkgs.xorg.xinput} --set-prop "pointer:Logitech Gaming Mouse G502" "libinput Accel Profile Enabled" 0, 1 ${pkgs.xorg.xinput} --set-prop "pointer:Logitech Gaming Mouse G502" "libinput Accel Speed" -0.4 ''; - services.xserver.displayManager.setupCommands = '' - ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --mode 1920x1080 --pos 2560x0 --rotate right --output DP-2 --primary --mode 2560x1440 --pos 0x480 --rotate normal - ''; + # services.xserver.displayManager.setupCommands = '' + # ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --mode 1920x1080 --pos 2560x0 --rotate right --output DP-2 --primary --mode 2560x1440 --pos 0x480 --rotate normal + # ''; # Backup environment services.xserver.windowManager.qtile.enable = true; diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix index 7596e56..5bf0270 100644 --- a/hosts/muon/home.nix +++ b/hosts/muon/home.nix @@ -13,7 +13,7 @@ let cfg = osConfig.mods; in { wayland.windowManager.hyprland.settings = { monitor = [ "DP-2,2560x1440@144,0x480,1" - "DP-2,1920x1080,0x480,1,transform,1" + "HDMI-A-2,1920x1080,2560x0,1,transform,3" ]; input.sensitivity = -0.4; }; diff --git a/modules/home/desktop/hyprland.nix b/modules/home/desktop/hyprland.nix index 70ed9bb..2b7d9c1 100644 --- a/modules/home/desktop/hyprland.nix +++ b/modules/home/desktop/hyprland.nix @@ -8,7 +8,7 @@ wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - systemd.enable = true; + # systemd.enable = true; settings = { exec-once = "${lib.getExe pkgs.waybar}"; diff --git a/modules/home/desktop/social.nix b/modules/home/desktop/social.nix index eb36242..32a340f 100644 --- a/modules/home/desktop/social.nix +++ b/modules/home/desktop/social.nix @@ -3,7 +3,7 @@ lib.mkEnableOption "enables social media clients"; config = lib.mkIf config.mods.social.enable { - home.packages = with pkgs; lib.mkAfter [ + home.packages = with pkgs; [ # Communication kotatogram-desktop signal-desktop diff --git a/modules/home/terminal/tools.nix b/modules/home/terminal/tools.nix index 625e99b..31abf3e 100644 --- a/modules/home/terminal/tools.nix +++ b/modules/home/terminal/tools.nix @@ -2,11 +2,6 @@ options.mods.terminal.tools.enable = lib.mkEnableOption "enables cli tools"; config = lib.mkIf config.mods.terminal.tools.enable { - programs.nh = { - enable = true; - flake = config.xdg.configFile."home"; - }; - home.packages = with pkgs; [ # libraries glow diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix index 9cc5f1d..e1c9ad3 100644 --- a/modules/nixos/core/nix.nix +++ b/modules/nixos/core/nix.nix @@ -1,4 +1,10 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, config, ... }: { + programs.nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/${config.mods.user.name}/.config/home"; + }; nix.settings = { substituters = [ "https://cache.nixos.org" diff --git a/modules/nixos/desktop/xorg.nix b/modules/nixos/desktop/xorg.nix index 2bc3b39..3844d2a 100644 --- a/modules/nixos/desktop/xorg.nix +++ b/modules/nixos/desktop/xorg.nix @@ -3,6 +3,7 @@ config = lib.mkIf config.mods.xorg.enable { services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; services.xserver.xkb.layout = "us"; services.xserver.xkb.options = "caps:escape"; }; diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index 85413d7..979f64a 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -30,17 +30,10 @@ in { }; }; - # fonts = with pkgs; [ - # openmoji-color - # mononoki - # (nerdfonts.override { fonts = [ "Mononoki" ]; }) - # ]; - - # fontconfig = { - # hinting.autohint = true; - # defaultFonts = { - # emoji = [ "OpenMoji Color" ]; - # }; - # }; + fonts.packages = with pkgs; [ + openmoji-color + mononoki + (nerdfonts.override { fonts = [ "Mononoki" ]; }) + ]; }; } diff --git a/modules/nixos/unfree/nvidia.nix b/modules/nixos/unfree/nvidia.nix index a43a12b..16c62da 100644 --- a/modules/nixos/unfree/nvidia.nix +++ b/modules/nixos/unfree/nvidia.nix @@ -8,6 +8,7 @@ in { description = "enables proprietary nvidia drivers"; }; packages = lib.mkOption { + # default = [ "nvidia-x11" "nvidia-settings" "nvidia-persistenced" ]; default = [ "nvidia-x11" ]; description = "unfree packages"; }; @@ -25,18 +26,35 @@ in { driSupport32Bit = true; }; - services.xserver.videoDrivers = [ "nvidia" ]; + # boot.kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ]; + # boot.initrd.kernelModules = [ "nvidia" ]; + services.xserver.videoDrivers = [ "nvidia" "nvidia-dkms" ]; hardware.nvidia = { modesetting.enable = true; - powerManagement.enable = false; + powerManagement.enable = true; powerManagement.finegrained = false; open = false; nvidiaSettings = false; package = config.boot.kernelPackages.nvidiaPackages."${cfg.driver}"; + # package = let + # rcu_patch = pkgs.fetchpatch { + # url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; + # hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; + # }; + # in config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "535.154.05"; + # sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; + # sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; + # openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; + # settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; + # persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; + + # patches = [ rcu_patch ]; + # }; }; }; }