diff options
| -rw-r--r-- | config/plasma/default.nix | 2 | ||||
| -rw-r--r-- | config/sway/default.nix | 8 | ||||
| -rwxr-xr-x | dist/bar.sh | 10 | ||||
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | machines/x/configuration.nix | 6 | ||||
| -rw-r--r-- | machines/x/home.nix | 14 | ||||
| -rw-r--r-- | modules/amdgpu.nix | 6 | ||||
| -rw-r--r-- | modules/laptop.nix | 20 | ||||
| -rw-r--r-- | modules/login.nix | 7 | ||||
| -rw-r--r-- | modules/wm_utils.nix | 10 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 | ||||
| -rw-r--r-- | packages/wbg.nix | 74 | ||||
| -rw-r--r-- | packages/wlroots.nix | 4 |
13 files changed, 61 insertions, 120 deletions
diff --git a/config/plasma/default.nix b/config/plasma/default.nix index 5ade450..1aee0e0 100644 --- a/config/plasma/default.nix +++ b/config/plasma/default.nix @@ -6,7 +6,7 @@ home.packages = [ pkgs.bibata-cursors pkgs.papirus-icon-theme - kdePackages.yakuake + pkgs.kdePackages.yakuake ]; gtk = { diff --git a/config/sway/default.nix b/config/sway/default.nix new file mode 100644 index 0000000..b0906e0 --- /dev/null +++ b/config/sway/default.nix @@ -0,0 +1,8 @@ +{ home, pkgs, ... }: + +{ + home.packages = with pkgs; [ + sway + autotiling-rs + ]; +} diff --git a/dist/bar.sh b/dist/bar.sh index d2d3627..156fe44 100755 --- a/dist/bar.sh +++ b/dist/bar.sh @@ -33,7 +33,9 @@ volume() { pamixer --get-volume } -while [[ true ]]; do - dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" - sleep 1 -done +# while [[ true ]]; do +# dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" +# sleep 1 +# done + +echo "| $(wifi) | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1738275749, - "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738309554, - "narHash": "sha256-NP4gXsNrVIby2NBDc6CrqptP7Ojg9X9Ofr+mVEV/WJ8=", + "lastModified": 1738511497, + "narHash": "sha256-SLm1b1pYnP2ufRbqVqe/ZoPwzmxLKZWbLxEpqM6pFIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99f315bd7e240a92e0b7a1d28d133267765c6e69", + "rev": "75c8548d8118c31509b89ffd7df6c322b94017dd", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738142207, - "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix index 5cf5313..edfe0ba 100644 --- a/machines/x/configuration.nix +++ b/machines/x/configuration.nix @@ -27,10 +27,10 @@ in { "virtualization.nix" "remapcapslock.nix" - "wm_utils.nix" - "polkit.nix" + # "wm_utils.nix" + # "polkit.nix" "login.nix" - # "plasma.nix" + "plasma.nix" ]); boot.loader = { diff --git a/machines/x/home.nix b/machines/x/home.nix index 16d9cf2..e50491b 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -54,13 +54,13 @@ "nvim" # "qtile" - "dwl.nix" - "themes.nix" - "way-displays" - "swaylock" - "dunst" - - # "plasma" + # "dwl.nix" + "plasma" + # "sway" + # "themes.nix" + # "way-displays" + # "swaylock" + # "dunst" "alacritty" "spotify-player" diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix index f8828f0..430faf3 100644 --- a/modules/amdgpu.nix +++ b/modules/amdgpu.nix @@ -3,7 +3,7 @@ { hardware.graphics.enable = true; hardware.graphics.extraPackages = with pkgs; [ - # rocmPackages.clr.icd + rocmPackages.clr.icd amdvlk vaapiVdpau libvdpau-va-gl @@ -15,7 +15,7 @@ services.xserver.videoDrivers = [ "modesetting" ]; - /* systemd.tmpfiles.rules = [ + systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" - ]; */ + ]; } diff --git a/modules/laptop.nix b/modules/laptop.nix index 317c5e4..39719ae 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -1,16 +1,16 @@ { pkgs, config, ... }: { - # services.tlp = { - # enable = true; - # settings = { - # CPU_SCALING_GOVERNOR_ON_AC = "performance"; - # CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - # - # CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - # CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - # }; - # }; + /* services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + }; + }; */ boot = { kernelModules = [ "acpi_call" ]; diff --git a/modules/login.nix b/modules/login.nix index 0789cff..c439e52 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -10,8 +10,8 @@ enable = true; settings = { default_session = { - # command = "tuigreet --time --remember --cmd \"startplasma-wayland\""; - command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; + command = "tuigreet --time --remember --cmd \"startplasma-wayland\""; + # command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; user = "greeter"; }; }; @@ -36,6 +36,9 @@ security.pam.services.swaylock.text = '' auth include login ''; + security.pam.loginLimits = [ + { domain = "@users"; item = "rtprio"; type = "-"; value = 1; } + ]; services.libinput.enable = true; diff --git a/modules/wm_utils.nix b/modules/wm_utils.nix index 1f1f417..e29b287 100644 --- a/modules/wm_utils.nix +++ b/modules/wm_utils.nix @@ -1,8 +1,6 @@ { pkgs, ... }: -let - wbg = (pkgs.callPackage ../packages/wbg.nix {}); -in { +{ environment.systemPackages = with pkgs; [ polkit_gnome @@ -11,13 +9,17 @@ in { inotify-tools + wbg + wirelesstools pamixer brightnessctl networkmanagerapplet + grim + slurp sway-launcher-desktop - ] ++ [ wbg ]; + ]; xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal ]; diff --git a/packages/dwl.nix b/packages/dwl.nix index da4c83c..8e6e68b 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "compromyse"; - hash = "sha256-xF8vqAkuRYJob4e0HxuBZHvXUvVjW5QvwgYiljkzp/M="; + hash = "sha256-XY57sxbS24qZ+oKXfCLcbE3EqGkVKNQqx/1mELI6FWs="; }; nativeBuildInputs = [ diff --git a/packages/wbg.nix b/packages/wbg.nix deleted file mode 100644 index b9ef787..0000000 --- a/packages/wbg.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitea, - pkg-config, - meson, - ninja, - pixman, - tllist, - wayland, - wayland-scanner, - wayland-protocols, - nanosvg, - libjxl, - enablePNG ? true, - enableJPEG ? true, - enableWebp ? true, - # Optional dependencies - libpng, - libjpeg, - libwebp, -}: - -stdenv.mkDerivation rec { - pname = "wbg"; - version = "1.2.0"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "dnkl"; - repo = "wbg"; - rev = "master"; - hash = "sha256-ikwOVtR5cXZGd2GE/O4ej6cOQZomyEKkPcKe08EtPw0="; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - wayland-scanner - ]; - - buildInputs = - [ - pixman - tllist - wayland - wayland-protocols - nanosvg - libjxl - ] - ++ lib.optional enablePNG libpng - ++ lib.optional enableJPEG libjpeg - ++ lib.optional enableWebp libwebp; - - mesonBuildType = "release"; - - mesonFlags = [ - (lib.mesonEnable "system-nanosvg" true) - (lib.mesonEnable "png" enablePNG) - (lib.mesonEnable "jpeg" enableJPEG) - (lib.mesonEnable "webp" enableWebp) - ]; - - meta = with lib; { - description = "Wallpaper application for Wayland compositors"; - homepage = "https://codeberg.org/dnkl/wbg"; - changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; - license = licenses.isc; - maintainers = with maintainers; [ ]; - platforms = with platforms; linux; - mainProgram = "wbg"; - }; -} diff --git a/packages/wlroots.nix b/packages/wlroots.nix index 4978a93..4599827 100644 --- a/packages/wlroots.nix +++ b/packages/wlroots.nix @@ -15,8 +15,8 @@ let repo = "wlroots"; repo_git = "https://${domain}/${owner}/${repo}"; branch = "master"; - rev = "38923826c3bd2c8d5752b63570063282e658e2b0"; - sha256 = "sha256-G4P26O08N7zDj3ehhPwqYQm82ij4oI4SI4eehvSagc8="; + rev = "d305934ebe6852785a1f425ee96861f0b7280d76"; + sha256 = "sha256-NnPSC5p/phTFe+nWp9vl8LUbmBO/RXSSUuDZ2boucXY="; }; ignore = [ "wlroots" |