diff options
| author | adikro <adikro@disroot.org> | 2025-12-07 20:37:31 +0100 |
|---|---|---|
| committer | adikro <adikro@disroot.org> | 2025-12-07 20:37:31 +0100 |
| commit | 6920fa481c927b1ec6735a00bab31f77cb00e961 (patch) | |
| tree | d19ebcb9edde8ac325b0c75ab5b76614e26b406e | |
| parent | 4cf79fcc579909d334a81b23c1578daa41fff691 (diff) | |
reverted unstable kernel, added stable mesa specialization
| -rw-r--r-- | flake.lock | 66 | ||||
| -rw-r--r-- | home/editors/nixvim.nix | 7 | ||||
| -rw-r--r-- | home/home.nix | 2 | ||||
| -rw-r--r-- | home/wayland/niri/niri.nix | 1 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 33 | ||||
| -rw-r--r-- | modules/boot.nix | 8 | ||||
| -rw-r--r-- | modules/hyprland.nix | 2 |
7 files changed, 67 insertions, 52 deletions
@@ -394,11 +394,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765024946, - "narHash": "sha256-GkPsL9anbbrmtWMP/O7W2+0WuktiK+4hOx5ziM+DQ3Y=", + "lastModified": 1765130329, + "narHash": "sha256-UXBg323poNozlJBEQT7ckSV0XmjGHPHgmDgqNGlmQrU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "f8d5aad1a1f61e1b6443c27394a38c8c54d39e9e", + "rev": "532ca053d6d7ca4afd0b7980b91fcb5bb09da552", "type": "github" }, "original": { @@ -685,11 +685,11 @@ ] }, "locked": { - "lastModified": 1764979571, - "narHash": "sha256-xOGEM8dZ6WtOnf+fkTthtiUbE47ZCEvuZTVsOrdTEZU=", + "lastModified": 1765066394, + "narHash": "sha256-08cJUfVwCyG4maboXVeY+TG22/gWiboRCXK8/aHie40=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "a70eaf7ca72ae845d53e2b2aa6106eebb00a4ed0", + "rev": "513b3de408734b66a549cea800f67a5a0004cdf8", "type": "github" }, "original": { @@ -701,11 +701,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1764968664, - "narHash": "sha256-aueNP7DLGEqX+eUlkMz0X7h0X3c4IxLLxhMBG7MTPpg=", + "lastModified": 1765065307, + "narHash": "sha256-+if1i/PGoz8EdTS3KTR8prrc0MTKdInr7D4NcGmMBlw=", "owner": "neovim", "repo": "neovim", - "rev": "d6bee7e407442112ee9008ea35d6fe73dbb3eaaf", + "rev": "0f3e3c87b738f1c81fa22b6e5f2a9a847d59ebd3", "type": "github" }, "original": { @@ -726,11 +726,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765008770, - "narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", + "lastModified": 1765120349, + "narHash": "sha256-MvwrHRV80hOdEwfLgI16XhApHuvj69aAgUWQ8ZBgAqE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "935080f54490e3e7b1eda731cbe1478744546ea8", + "rev": "0f4acff79842637e92f5f2609d3844bac9d5e592", "type": "github" }, "original": { @@ -804,11 +804,11 @@ ] }, "locked": { - "lastModified": 1764980756, - "narHash": "sha256-tPbSzm3iuU+mdZC1gjRqCXYavD59TyEDBMq3MLMbRZQ=", + "lastModified": 1765094654, + "narHash": "sha256-97PG9MuCKbqFzxPkhDQU/ZlttRLA+wdZX/05TzBfmu4=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "704c555cb2d46a715ca8493243c514ba19986e5b", + "rev": "aa8081c2a02984ce81c2d45eaf4ec40d4e450217", "type": "github" }, "original": { @@ -850,11 +850,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764831616, - "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { @@ -921,11 +921,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1765025132, - "narHash": "sha256-USUncEehfJMi6MQAJF92Lu8WDJ4FFj25uSEXCtIL6G4=", + "lastModified": 1765115924, + "narHash": "sha256-taZc/QD5DeZkXsyl+AJiS2Q5Z8EXJPzZz98uWfdXvvs=", "owner": "nix-community", "repo": "nixvim", - "rev": "b502802572ea81ebf16090f97f27219f7057a7b0", + "rev": "cd0443e166c1cd35283e9be0ce3fc2966456bc5a", "type": "github" }, "original": { @@ -941,11 +941,11 @@ ] }, "locked": { - "lastModified": 1765023848, - "narHash": "sha256-tmR9oI50ESiX8rm3k1O0h6kXOypgp57AYcO/Ybeg51Y=", + "lastModified": 1765120186, + "narHash": "sha256-erA1pPuo6ZYFD3nNqscR8URisq1XXOaNzS/C/ThJkMQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ff04d643315d92bfab9dc81837bc17949e06370f", + "rev": "6fc754104858479e02bf51a55eef5e4e8ad722b3", "type": "github" }, "original": { @@ -985,11 +985,11 @@ ] }, "locked": { - "lastModified": 1764848692, - "narHash": "sha256-rPnPUOiG/Cg9sS7JWY5RKyZaN3g5ZoeLoJ1jx13POaI=", + "lastModified": 1765119890, + "narHash": "sha256-yGmmJXggysHE/BDhhM/yByM9EzqP4xMlx7EaW5fYhjU=", "owner": "PrismLauncher", "repo": "PrismLauncher", - "rev": "92738feebae6e25bd2c06985516f66cc19eae01d", + "rev": "ec129eeee8eb9d9fd20a83638bcafa2544c95b6b", "type": "github" }, "original": { @@ -1129,11 +1129,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1764698597, - "narHash": "sha256-4f0y9Fo3AChngd/qRQ7wbcy6FH33NFZbyFXn7IeUI14=", + "lastModified": 1765082296, + "narHash": "sha256-EcefoixU9ht+P6QB/TfjLY9E3MdJVfeSec6G8Ges0pA=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1da6ebbbcf0301ff773e9c43bdd4c051af9523f7", + "rev": "ac4927ea1ec7e7ea3635a1d8b933106a596c4356", "type": "github" }, "original": { @@ -1306,11 +1306,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1764949583, - "narHash": "sha256-pB+q3HIyIA3k1AnDiU9MDfJ5xNso1XX95qV0F5oe3cM=", + "lastModified": 1765101649, + "narHash": "sha256-9Cs7UQknK3i4R5AXzh194xiDDm/nO7UvlAG/BfOMLSs=", "owner": "sxyazi", "repo": "yazi", - "rev": "c569263a5084f627ae70f983c271464b42890426", + "rev": "9ae8b90d2328139622e6e1285889310adb57b81b", "type": "github" }, "original": { diff --git a/home/editors/nixvim.nix b/home/editors/nixvim.nix index 2ea5b94..b8a4e5a 100644 --- a/home/editors/nixvim.nix +++ b/home/editors/nixvim.nix @@ -13,6 +13,9 @@ plugins = { lualine.enable = true; + oil.enable = true; + lazygit.enable = true; + persistence.enable = true; nvim-autopairs.enable = true; neoscroll.enable = true; bufferline.enable = true; @@ -21,7 +24,7 @@ treesitter = { enable = true; settings = { - indent.enable = true; + indent.enable = true; }; }; @@ -88,7 +91,7 @@ scrolloff = 5; clipboard = { providers.wl-copy.enable = true; - register = "wl-copy"; + register = "unnamedplus"; }; }; }; diff --git a/home/home.nix b/home/home.nix index 121b61c..2d4bf04 100644 --- a/home/home.nix +++ b/home/home.nix @@ -29,6 +29,8 @@ home.stateVersion = "25.05"; home.packages = with pkgs; [ + obs-studio + wofi bottles ncdu equibop diff --git a/home/wayland/niri/niri.nix b/home/wayland/niri/niri.nix index 60a5e16..341866a 100644 --- a/home/wayland/niri/niri.nix +++ b/home/wayland/niri/niri.nix @@ -70,6 +70,7 @@ spawn-at-startup = [ { command = [ "${lib.getExe pkgs.xwayland-satellite}" ]; } { command = [ "awww-daemon" ]; } + # { command = [ "noctalia-shell" ]; } { command = [ "wl-paste --watch cliphist store" ]; } ]; }; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 3de13e7..3d82800 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -10,7 +10,7 @@ ../../modules/boot.nix ../../modules/audio.nix ../../modules/networking.nix - ../../modules/scx.nix + # ../../modules/scx.nix ../../modules/tor.nix # ../../modules/hyprland.nix ../../modules/niri.nix @@ -29,6 +29,8 @@ useUserPackages = true; }; + services.smartd.enable = true; + services.spotifyd = { enable = true; }; @@ -42,6 +44,12 @@ ]; }; + nixpkgs.config.packageOverrides = pkgs: { + bottles = pkgs.bottles.override { + removeWarningPopup = true; + }; + }; + programs.xwayland = { enable = true; package = pkgs.xwayland-satellite; @@ -91,27 +99,29 @@ services.lact.enable = true; enable = true; enable32Bit = true; }; - # amdgpu = { - # initrd.enable = true; - # overdrive.enable = true; - # }; + amdgpu = { + initrd.enable = true; + overdrive.enable = true; + }; }; chaotic = { mesa-git = { enable = true; - fallbackSpecialisation = false; + fallbackSpecialisation = true; extraPackages = with pkgs; [ mesa_git.opencl ]; }; }; + services.dbus.enable = true; + xdg.portal = { enable = true; - # extraPortals = with pkgs; [ - # xdg-desktop-portal-gtk # For a fallback file chooser - # ]; + extraPortals = with pkgs; [ + xdg-desktop-portal-gtk + ]; }; time.timeZone = "Europe/Warsaw"; @@ -159,6 +169,7 @@ environment.sessionVariables = { environment.systemPackages = with pkgs; [ vkd3d dxvk + pigz nautilus gnome-keyring kdePackages.dolphin @@ -166,8 +177,8 @@ environment.sessionVariables = { swayidle helvum fuzzel -# wineWowPackages.waylandFull - wineWowPackages.unstableFull + wineWowPackages.waylandFull + # wineWowPackages.unstableFull winetricks tuigreet linux-firmware diff --git a/modules/boot.nix b/modules/boot.nix index aba7a41..dab324a 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -14,12 +14,10 @@ supportedFilesystems = [ "ntfs" ]; initrd.kernelModules = [ "amdgpu" "kvm-amd" ]; kernelParams = [ - # "video=DP-1:2560x1440@240" + "video=DP-1:2560x1440@240" "quiet" ]; - kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4; - # kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { mArch = "ZEN4"; }; - # kernelPackages = pkgs.linuxPackages_zen; - # kernelPackages = pkgs.linuxPackages_6_12; + # kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4; + kernelPackages = pkgs.linuxPackages_latest; }; } diff --git a/modules/hyprland.nix b/modules/hyprland.nix index f3e35fa..471f696 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -2,6 +2,6 @@ { programs.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; }; } |
