From 752d838327bacd3fa70f0fad664f40ea4de5dedf Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Thu, 12 Feb 2026 14:39:04 +0100 Subject: [PATCH] new laptop --- .config/hypr/hyprland.colors.conf | 2 +- .config/hypr/hyprland.conf | 111 +++---- configuration.nix | 85 ++--- flake.lock | 497 +++++++++++++++++++----------- flake.nix | 12 +- hardware-configuration.nix | 30 +- home.nix | 21 +- 7 files changed, 447 insertions(+), 311 deletions(-) diff --git a/.config/hypr/hyprland.colors.conf b/.config/hypr/hyprland.colors.conf index f90020c..2b9b894 100644 --- a/.config/hypr/hyprland.colors.conf +++ b/.config/hypr/hyprland.colors.conf @@ -7,4 +7,4 @@ misc { background_color = rgba(0e1514FF) } -windowrulev2 = bordercolor rgba(80d4d5AA) rgba(80d4d577),pinned:1 \ No newline at end of file +#windowrulev2 = bordercolor rgba(80d4d5AA) rgba(80d4d577),pinned:1 diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 320883c..5ae5c0b 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -12,6 +12,7 @@ # env = AQ_DRM_DEVICES,/dev/dri/card1 #env = AQ_NO_MODIFIERS,1 monitor=,preferred,auto,1 +monitor=eDP-1,1920x1200@60.0,3564x0,1.0,cm,hdr,sdrbrightness,1.4,sdrsaturation,0.8,bitdepth,10 # env = LIBVA_DRIVER_NAME,nvidia # env = XDG_SESSION_TYPE,wayland @@ -180,7 +181,7 @@ decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more rounding = 10 - + blur { enabled = true size = 2 @@ -253,36 +254,36 @@ misc { mouse_move_enables_dpms=true } -windowrule=float,class:blueman -windowrule=float,class:Anydesk -windowrule=float,class:file_progress -windowrule=float,class:confirm -windowrule=float,class:dialog -windowrule=float,class:download -windowrule=float,class:notification -windowrule=float,class:error -windowrule=float,class:splash -windowrule=float,class:confirmreset -windowrule=float,title:Open File -windowrule=float,title:branchdialog -windowrule=tile,title:*vivaldi* +#windowrule=float,class:blueman +#windowrule=float,class:Anydesk +#windowrule=float,class:file_progress +#windowrule=float,class:confirm +#windowrule=float,class:dialog +#windowrule=float,class:download +#windowrule=float,class:notification +#windowrule=float,class:error +#windowrule=float,class:splash +#windowrule=float,class:confirmreset +#windowrule=float,title:Open File +#windowrule=float,title:branchdialog +#windowrule=tile,title:*vivaldi* # can be more specific (:bar, :mediaControls, etc) -layerrule = blur, quickshell:bar -layerrule = ignorealpha .2, quickshell:bar -layerrule = blur, quickshell:popup -layerrule = ignorealpha .2, quickshell:popup -layerrule = blur, quickshell:notificationPopup -layerrule = ignorealpha .2, quickshell:notificationPopup -layerrule = blur, quickshell:overview -layerrule = blurpopups, quickshell:overview -layerrule = ignorealpha .2, quickshell:overview -layerrule = blur, quickshell:sidebarLeft -layerrule = blurpopups, quickshell:sidebarLeft -layerrule = ignorealpha .2, quickshell:sidebarLeft -layerrule = blur, quickshell:sidebarRight -layerrule = blurpopups, quickshell:sidebarRight -layerrule = ignorealpha .2, quickshell:sidebarRight +layerrule = blur on, match:namespace quickshell:bar +layerrule = ignore_alpha .2, match:namespace quickshell:bar +layerrule = blur on, match:namespace quickshell:popup +layerrule = ignore_alpha .2, match:namespace quickshell:popup +layerrule = blur on, match:namespace quickshell:notificationPopup +layerrule = ignore_alpha .2, match:namespace quickshell:notificationPopup +layerrule = blur on, match:namespace quickshell:overview +layerrule = blur_popups on, match:namespace quickshell:overview +layerrule = ignore_alpha .2, match:namespace quickshell:overview +layerrule = blur on, match:namespace quickshell:sidebarLeft +layerrule = blur_popups on, match:namespace quickshell:sidebarLeft +layerrule = ignore_alpha .2, match:namespace quickshell:sidebarLeft +layerrule = blur on, match:namespace quickshell:sidebarRight +layerrule = blur_popups on, match:namespace quickshell:sidebarRight +layerrule = ignore_alpha .2, match:namespace quickshell:sidebarRight blurls=gtk-layer-shell blurls=lockscreen @@ -309,7 +310,7 @@ $mainMod = SUPER bind = $mainMod, T, exec, kitty bind=$mainMod,K,exec,kitty bind=SUPER,B,exec,vivaldi-stable -bind = super+ctrl, q, exit, +bind = super+ctrl, q, exit, bind = $mainMod, E, exec, cosmic-files bind = $mainMod+SHIFT, E, exec, dolphin #! current window management @@ -334,8 +335,8 @@ bindle=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 5%-;canberr bindl=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle bindl=, XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle -bindl=, XF86AudioPlay, exec, playerctl play-pause # the stupid key is called play , but it toggles -bindl=, XF86AudioNext, exec, playerctl next +bindl=, XF86AudioPlay, exec, playerctl play-pause # the stupid key is called play , but it toggles +bindl=, XF86AudioNext, exec, playerctl next bindl=, XF86AudioPrev, exec, playerctl previous #! focus @@ -416,27 +417,27 @@ bindm = $mainMod, mouse:273, resizewindow bind = CTRL+ALT,1,pass,^(com\.obsproject\.Studio)$ bind = CTRL+ALT,2,pass,^(com\.obsproject\.Studio)$ -windowrulev2=opacity 0.9,class:Code -windowrulev2=opacity 0.9,class:Spotify +#windowrulev2=opacity 0.9,class:Code +#windowrulev2=opacity 0.9,class:Spotify -windowrulev2=workspace 10,class:Code # Open Code on secondary monitor +#windowrulev2=workspace 10,class:Code # Open Code on secondary monitor -windowrulev2 = float,class:^(qt5ct)$ -windowrulev2 = float,class:^(nwg-look)$ -windowrulev2 = float,class:^(org.kde.ark)$ -windowrulev2 = float,class:^(Signal)$ #Signal-Gtk -windowrulev2 = float,class:^(com.github.rafostar.Clapper)$ #Clapper-Gtk -windowrulev2 = float,class:^(app.drey.Warp)$ #Warp-Gtk -windowrulev2 = float,class:^(net.davidotek.pupgui2)$ #ProtonUp-Qt -windowrulev2 = float,class:^(yad)$ #Protontricks-Gtk -windowrulev2 = float,class:^(eog)$ #Imageviewer-Gtk -windowrulev2 = float,class:^(io.gitlab.theevilskeleton.Upscaler)$ #Upscaler-Gtk -windowrulev2 = float,class:^(pavucontrol)$ -windowrulev2 = float,class:^(blueman-manager)$ -windowrulev2 = float,class:^(nm-applet)$ -windowrulev2 = float,class:^(nm-connection-editor)$ -windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = tile,class:dev.warp.Warp +#windowrulev2 = float,class:^(qt5ct)$ +#windowrulev2 = float,class:^(nwg-look)$ +#windowrulev2 = float,class:^(org.kde.ark)$ +#windowrulev2 = float,class:^(Signal)$ #Signal-Gtk +#windowrulev2 = float,class:^(com.github.rafostar.Clapper)$ #Clapper-Gtk +#windowrulev2 = float,class:^(app.drey.Warp)$ #Warp-Gtk +#windowrulev2 = float,class:^(net.davidotek.pupgui2)$ #ProtonUp-Qt +#windowrulev2 = float,class:^(yad)$ #Protontricks-Gtk +#windowrulev2 = float,class:^(eog)$ #Imageviewer-Gtk +#windowrulev2 = float,class:^(io.gitlab.theevilskeleton.Upscaler)$ #Upscaler-Gtk +#windowrulev2 = float,class:^(pavucontrol)$ +#windowrulev2 = float,class:^(blueman-manager)$ +#windowrulev2 = float,class:^(nm-applet)$ +#windowrulev2 = float,class:^(nm-connection-editor)$ +#windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$ +#windowrulev2 = tile,class:dev.warp.Warp # some themeing exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' @@ -452,7 +453,7 @@ decoration { #windowrule = nofullscreenrequest,flameshot -windowrule = float,title:flameshot -windowrule = monitor 1,title:flameshot -windowrule = move 0 0,title:flameshot -windowrule = noanim,title:flameshot +#windowrule = float,title:flameshot +#windowrule = monitor 1,title:flameshot +#windowrule = move 0 0,title:flameshot +#windowrule = noanim,title:flameshot diff --git a/configuration.nix b/configuration.nix index 80831b0..659074d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,7 +11,7 @@ in { imports = [ - nixos-hardware.nixosModules.lenovo-legion-16ach6h-hybrid # this is borked in latest update for some reason, edid doesn't build +# nixos-hardware.nixosModules.lenovo-legion-16ach6h-hybrid # this is borked in latest update for some reason, edid doesn't build # nixos-hardware.nixosModules.common-cpu-amd # nixos-hardware.nixosModules.common-cpu-amd-pstate # nixos-hardware.nixosModules.common-cpu-amd-zenpower @@ -22,7 +22,7 @@ in ./hardware-configuration.nix # /etc/nixos/cachix.nix ]; - nyx.low-power.enable = true; + # nyx.low-power.enable = true; hardware.nvidia.dynamicBoost.enable = lib.mkForce false; nixpkgs.config.permittedInsecurePackages = [ @@ -48,18 +48,18 @@ in nix.daemonCPUSchedPolicy = "idle"; nix.daemonIOSchedClass = "idle"; - fileSystems."/media/New BTRFS" = { - device = "/dev/disk/by-uuid/26b1fa88-e270-45c7-a6c0-d46c9d4c6c90"; - fsType = "btrfs"; - }; - fileSystems."/media/secondary" = { - device = "/dev/disk/by-uuid/050574C34881C3B9"; - fsType = "ntfs"; - }; - fileSystems."/media/windows" = { - device = "/dev/disk/by-uuid/846A9EF06A9EDE6C"; - fsType = "ntfs"; - }; + #fileSystems."/media/New BTRFS" = { + # device = "/dev/disk/by-uuid/26b1fa88-e270-45c7-a6c0-d46c9d4c6c90"; + # fsType = "btrfs"; + #}; + #fileSystems."/media/secondary" = { + # device = "/dev/disk/by-uuid/050574C34881C3B9"; + # fsType = "ntfs"; + #}; + #fileSystems."/media/windows" = { + # device = "/dev/disk/by-uuid/846A9EF06A9EDE6C"; + # fsType = "ntfs"; + #}; # services.beesd.filesystems = { # root = { @@ -72,7 +72,7 @@ in # }; # }; - networking.hostName = "lenovo-nix"; + networking.hostName = "aura"; # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.nameservers = ["1.1.1.1"]; @@ -125,9 +125,9 @@ in services.dnsmasq.enable = true; services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; - # services.desktopManager.plasma6 = { - # enable = true; - # }; + services.desktopManager.plasma6 = { + enable = true; + }; # services.desktopManager.gnome.enable = true; services.xserver = { enable = false; @@ -162,7 +162,7 @@ in hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; programs.wireshark.enable = true; - programs.adb.enable = true; + #programs.adb.enable = true; programs.partition-manager.enable = true; time.hardwareClockInLocalTime = true; @@ -263,7 +263,7 @@ in # Visuals plymouth = { - enable = true; + enable = false; theme = "deus_ex"; # motion is also cool themePackages = with pkgs; [ (adi1090x-plymouth-themes.override { @@ -273,11 +273,11 @@ in }; kernelParams = [ # attempt to fix nvidia perf - "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" "module_blacklist=i915" + #"nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" "module_blacklist=i915" "delayacct" "initcall_blacklist=sysfb_init" - "quiet" - "splash" + #"quiet" + #"splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" @@ -315,12 +315,12 @@ in environment.systemPackages = with pkgs; [ git - nvtopPackages.full +# nvtopPackages.full btop lshw hyprpolkitagent - lenovo-legion +# lenovo-legion # required for quickshell config; needs to be here for them to be included in import/plugin path @@ -378,30 +378,41 @@ in nixpkgs.config.cudaSupport = true; # The nvidia fun part - hardware.graphics = { + hardware.graphics = { enable = true; # package = unstable-pkgs.mesa.drivers; # Steam support enable32Bit = true; # package32 = unstable-pkgs.pkgsi686Linux.mesa.drivers; extraPackages = with pkgs; [ - libvdpau-va-gl - nvidia-vaapi-driver + + # Required for modern Intel GPUs (Xe iGPU and ARC) + intel-media-driver # VA-API (iHD) userspace + vpl-gpu-rt # oneVPL (QSV) runtime + + # Optional (compute / tooling): + intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe + # libvdpau-va-gl + # nvidia-vaapi-driver ]; }; + environment.sessionVariables = { + LIBVA_DRIVER_NAME = "iHD"; + }; + hardware.enableRedistributableFirmware = true; - boot.kernelModules = ["amdgpu" "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "lenovo-legion-module"]; - hardware.nvidia = { - open = false; + #boot.kernelModules = ["amdgpu" "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "lenovo-legion-module"]; + #hardware.nvidia = { + # open = false; # modesetting.enable = true; # powerManagement.enable = true; # nvidiaSettings = true; - prime = { + # prime = { # hardware specific, beware! - amdgpuBusId = lib.mkForce "PCI:06:00:0"; - nvidiaBusId = lib.mkForce "PCI:01:00:0"; - }; - }; + # amdgpuBusId = lib.mkForce "PCI:06:00:0"; + # nvidiaBusId = lib.mkForce "PCI:01:00:0"; + # }; + #}; hardware.enableAllFirmware = true; services.cpupower-gui.enable = true; services.upower.enable = true; @@ -457,7 +468,7 @@ in # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/flake.lock b/flake.lock index 41e0d05..de9f8e8 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1755946532, - "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -46,11 +46,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1755272288, - "narHash": "sha256-ypTPb2eKcOBbOoyvPV0j4ZOXs4kayo73/2KI456QnE0=", + "lastModified": 1762034856, + "narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=", "owner": "zhaofengli", "repo": "colmena", - "rev": "5bf4ce6a24adba74a5184f4a9bef01d545a09473", + "rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1759584746, - "narHash": "sha256-df5r/j9jZaXhR3ASt5nRw420GEn2b0rGp9wrrzyvWM8=", + "lastModified": 1770758715, + "narHash": "sha256-FlRSDJ8OlCiWX+tIAZJkQnkBAAwbO125aUdAC6VJlOk=", "owner": "9001", "repo": "copyparty", - "rev": "41ed559faabdc180efc37fd027e7f1bb2d14d174", + "rev": "d44ea245307c06eb060b6e6f5c2cba91a759c940", "type": "github" }, "original": { @@ -82,21 +82,17 @@ "inputs": { "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", - "determinate-nixd-x86_64-darwin": [ - "determinate", - "determinate-nixd-aarch64-darwin" - ], "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", "nix": "nix", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1757699119, - "narHash": "sha256-iOOoVdrkcyk95Xg68TuPeAwpz+v80mgZCqil0jpPZuY=", - "rev": "1e16c8f8a44573bb0648c76b6c98352436f5171e", - "revCount": 304, + "lastModified": 1768964099, + "narHash": "sha256-sV1OJYyktJRl7I3HxeBvWTWXjqm2uCTS3gS1p+DLn7c=", + "rev": "a5469e9aa3870941320cb92d899b66e141c5a3cd", + "revCount": 394, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.11.2/01993f0b-1215-7072-ac1a-f2b27b566115/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.2/019bde7d-0725-73ef-9705-498c50ef6e00/source.tar.gz" }, "original": { "type": "tarball", @@ -106,37 +102,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-q1tqDvmfjDgLk/wbYf4pRhyHDS94iY85Q79FPBtcv7g=", + "narHash": "sha256-zK2dgNHh/p92rk5jN+Y1LOMn0HEdTsS+7XXwb2g52oM=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-E1vGfcQ5dqtRG9EDP6eOQWCnCIRB2XFkFBp2C4FgQ8c=", + "narHash": "sha256-ckvZP0zFcbzLXWYOJUqYXkKBt0b2IZcQEr7YjEVtwOI=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-GtxtkI0cOC2A30Xw6gCDTN7JxN1zJGh7/eIXr6AlTSA=", + "narHash": "sha256-8dLtm8FJrpyBmrNpspJj30/6I5HGEfjjXuFqURcZ8pk=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.2/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.2/x86_64-linux" } }, "dolphin-overlay": { @@ -192,11 +188,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -231,11 +227,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -323,6 +319,27 @@ "type": "github" } }, + "helium": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1770368695, + "narHash": "sha256-H3Bfb7mzu2ow29+bgNnmtYadIfjLXzxmAZQ9J31e3ZQ=", + "owner": "schembriaiden", + "repo": "helium-browser-nix-flake", + "rev": "b1a15d82e6d0991d48d4a1b3f0f27c4145bd3b6a", + "type": "github" + }, + "original": { + "owner": "schembriaiden", + "repo": "helium-browser-nix-flake", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -330,11 +347,11 @@ ] }, "locked": { - "lastModified": 1759573136, - "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", + "lastModified": 1770818644, + "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", + "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7", "type": "github" }, "original": { @@ -351,11 +368,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -415,11 +432,11 @@ ] }, "locked": { - "lastModified": 1758192433, - "narHash": "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "c44e749dd611521dee940d00f7c444ee0ae4cfb7", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -433,22 +450,23 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1758293956, - "narHash": "sha256-+UCEuPcCsWkyQh73KouiVZmcsW6ljVKHUUXDcJNI41w=", + "lastModified": 1767201430, + "narHash": "sha256-2FF66EaIbsc7CL1jKHbRFslSePDq40fzlTTbUlm5v3k=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "88326075743a677e76645ff163b392490419d4de", + "rev": "48a024e0322bbd7c4c88126498ec478444ec4cb2", "type": "github" }, "original": { @@ -457,6 +475,59 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland-plugins", + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland-plugins", + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland-plugins", + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland-plugins", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland-plugins", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-plugins": { "inputs": { "hyprland": "hyprland", @@ -470,11 +541,11 @@ ] }, "locked": { - "lastModified": 1758895089, - "narHash": "sha256-HOIITlSwB5iuVEVLmWNGu8bvI83Y2IbN8SzJQmBDwvg=", + "lastModified": 1769285097, + "narHash": "sha256-eVD4U3Oqzz0VU9ylJ5wo76xDcYKv2CpiiRXq4Is4QdA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4d940a10aff16b240533c9b6527a14ff91e5e5ae", + "rev": "06c0749a0dac978d89b1a76ae6adc76a3c15dbfa", "type": "github" }, "original": { @@ -497,11 +568,11 @@ ] }, "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -510,81 +581,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland-plugins", - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland-plugins", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland-plugins", - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland-plugins", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland-plugins", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1757694755, - "narHash": "sha256-j+w5QUUr2QT/jkxgVKecGYV8J7fpzXCMgzEEr6LG9ug=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -604,11 +600,11 @@ ] }, "locked": { - "lastModified": 1756810301, - "narHash": "sha256-wgZ3VW4VVtjK5dr0EiK9zKdJ/SOqGIBXVG85C3LVxQA=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "3d63fb4a42c819f198deabd18c0c2c1ded1de931", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -617,6 +613,65 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -631,11 +686,11 @@ ] }, "locked": { - "lastModified": 1756117388, - "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -658,11 +713,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -671,6 +726,38 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland-plugins", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "nix": { "inputs": { "flake-parts": "flake-parts", @@ -680,12 +767,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1757694985, - "narHash": "sha256-3Ia+y7Hbwnzcuf1hyuVnFtbnSR6ErQeFjemHdVxjCNE=", - "rev": "766f43aa6acb1b3578db488c19fbbedf04ed9f24", - "revCount": 22340, + "lastModified": 1768960381, + "narHash": "sha256-32oMe1y+kwvIJNiJsIvozTuSmDxcwST06i+0ak+L4AU=", + "rev": "45ce621408cb8c9a724193d5fe858eb839662db8", + "revCount": 24453, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.11.2/01993ee9-f8e7-7b80-80df-ec0a20a32514/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.2/019bde75-b4ee-74b2-a812-28dc2ee83d58/source.tar.gz" }, "original": { "type": "tarball", @@ -698,11 +785,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1759455985, - "narHash": "sha256-8qDv7NXH3fj1CDXed7c7vJLtrRKDZSo0x6TaWSfelVg=", + "lastModified": 1770778188, + "narHash": "sha256-KZHPn3L6veRgRwOyfhaeM5ZTJfpkoY9EICIzUcQn4w8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "eb5ab503cbd3cb386e8d85a55a9faed73ec7dc37", + "rev": "59e3b8189047bc591635645d2c682020c13eeac5", "type": "github" }, "original": { @@ -739,11 +826,11 @@ ] }, "locked": { - "lastModified": 1759032422, - "narHash": "sha256-WZf+FhebP2/1pK2np5xj/NuDjD6fXK2BHnq/tPUN18o=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ec7a78cb0e098832d8acac091a4df393259c4839", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -754,11 +841,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1770631810, + "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", "type": "github" }, "original": { @@ -801,11 +888,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -832,11 +919,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -863,12 +950,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", - "revCount": 808723, + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "revCount": 811874, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.808723%2Brev-b1b3291469652d5a2edb0becc4ef0246fff97a7c/0198daf7-011a-7703-95d7-57146e794342/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" }, "original": { "type": "tarball", @@ -877,12 +964,12 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", - "revCount": 856744, + "lastModified": 1768783163, + "narHash": "sha256-tLj4KcRDLakrlpvboTJDKsrp6z2XLwyQ4Zmo+w8KsY4=", + "rev": "bde09022887110deb780067364a0818e89258968", + "revCount": 930106, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.856744%2Brev-ca77296380960cd497a765102eeb1356eb80fed0/01992cf9-9347-761a-8963-9cbe43abe2fa/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.930106%2Brev-bde09022887110deb780067364a0818e89258968/019bd9ed-5f0b-7074-afb0-8bb5e13a7598/source.tar.gz" }, "original": { "type": "tarball", @@ -906,11 +993,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1758198701, - "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -922,11 +1009,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1758976413, - "narHash": "sha256-hEIDTaIqvW1NMfaNgz6pjhZPZKTmACJmXxGr/H6isIg=", + "lastModified": 1770537093, + "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3a3b32cc234f1683258d36c6232f150d57df015", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "type": "github" }, "original": { @@ -938,11 +1025,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -954,11 +1041,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -979,11 +1066,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -998,6 +1085,7 @@ "copyparty": "copyparty", "determinate": "determinate", "dolphin-overlay": "dolphin-overlay", + "helium": "helium", "home-manager": "home-manager", "hyprland-plugins": "hyprland-plugins", "nix-gaming": "nix-gaming", @@ -1025,6 +1113,21 @@ } }, "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1039,6 +1142,24 @@ "type": "github" } }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1073,11 +1194,11 @@ ] }, "locked": { - "lastModified": 1755354946, - "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -1092,11 +1213,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1759584043, - "narHash": "sha256-YCuCmg9nRLrtTz7Zex94C8kYzh8hoSzPOA72kMLpuxM=", + "lastModified": 1770707140, + "narHash": "sha256-3ZRA2+o5p1+FKWx988WbwB1SQ2Mz5aL95zxhL5iD+O0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "176555a4128ce90461354142ab85c7f536bfd267", + "rev": "db14437f8667f7f09784e2a4e73c105bdc1c7023", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 444a4d2..b576787 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,10 @@ { inputs = { #nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + helium = { + url = "github:schembriaiden/helium-browser-nix-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; zen-browser.url = "github:0xc000022070/zen-browser-flake"; @@ -33,8 +37,8 @@ copyparty.url = "github:9001/copyparty"; }; - outputs = { nixpkgs, determinate, colmena, zen-browser, dolphin-overlay, hyprland-plugins, home-manager, nixpkgs-unstable, nix-gaming, nix-index-database, ... }@attrs: { - nixosConfigurations.lenovo-nix = nixpkgs.lib.nixosSystem { + outputs = { nixpkgs, determinate, colmena, helium, zen-browser, dolphin-overlay, hyprland-plugins, home-manager, nixpkgs-unstable, nix-gaming, nix-index-database, ... }@attrs: { + nixosConfigurations.aura = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; modules = [ @@ -59,13 +63,13 @@ home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.dan = (import ./home.nix) { inherit colmena zen-browser nixpkgs-unstable nix-gaming hyprland-plugins; }; + home-manager.users.dan = (import ./home.nix) { inherit helium colmena zen-browser nixpkgs-unstable nix-gaming hyprland-plugins; }; home-manager.backupFileExtension = "backup"; } ./configuration.nix nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true; } - ./powersave.nix + #./powersave.nix ]; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index b0c8075..4b237f3 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -1,3 +1,6 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { @@ -5,33 +8,26 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/10ee9219-dc75-465c-a980-c09891f9e9c0"; - fsType = "btrfs"; - options = [ "subvol=@" ]; + { device = "/dev/disk/by-uuid/710ef99b-7ce3-465c-aee3-8547c8f10020"; + fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/473E-F632"; + { device = "/dev/disk/by-uuid/455E-A459"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; + swapDevices = + [ { device = "/dev/disk/by-uuid/8d804260-839d-48c0-bcb4-c08aeaa91cc2"; } + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/home.nix b/home.nix index 4865d6d..8f5b32e 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ colmena, zen-browser, nix-gaming, nixpkgs-unstable, /* suyu, */hyprland-plugins/*, hyprland*/, ... }: +{ helium, colmena, zen-browser, nix-gaming, nixpkgs-unstable, /* suyu, */hyprland-plugins/*, hyprland*/, ... }: { pkgs, inputs, ...}: let @@ -15,9 +15,12 @@ in zen-browser.homeModules.beta ]; home = { - stateVersion = "24.05"; + stateVersion = "25.11"; packages = with pkgs; [ + steam + helium + opencode linuxKernel.packages.linux_6_12.perf obs-studio flamegraph @@ -98,13 +101,13 @@ in godot_4 #rar wootility - surrealdb + #surrealdb pico-sdk elf2uf2-rs obsidian betaflight-configurator home-manager - glxinfo + #glxinfo pciutils nix-top grc @@ -135,9 +138,9 @@ in dust #jetbrains.webstorm #jetbrains.clion - jetbrains.datagrip + #jetbrains.datagrip # jetbrains.rider - jetbrains.idea-ultimate + #jetbrains.idea-ultimate jre_minimal datovka nwg-displays @@ -162,7 +165,7 @@ in cachix playerctl libcanberra-gtk3 # sound events - qt6ct + #qt6ct nil # nix language server nix-output-monitor expect @@ -187,7 +190,7 @@ in erlang terraform nodejs - corepack + #corepack ansible aria2 qbittorrent @@ -248,7 +251,7 @@ in nix-du graphviz - blender + #blender warpinator awatcher