diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2025-03-01 16:47:59 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2025-03-01 16:47:59 -0500 |
| commit | c61b1c10f0f2a61beefa7ede23ab7517f0f9f851 (patch) | |
| tree | ea387db417b1167e344cec148c357785095f2468 | |
| parent | e603acd4828053fdfdaf245992322b8533f667d8 (diff) | |
Update
| -rw-r--r-- | flake.lock | 42 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | machines/x1-pincer.nix | 2 | ||||
| -rw-r--r-- | modules/desktop.nix | 18 |
4 files changed, 25 insertions, 38 deletions
@@ -73,11 +73,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739696390, - "narHash": "sha256-pOAbTputXE8B7JbGQr6o930BIuNOhCvPtRLAroIS6ik=", + "lastModified": 1740850895, + "narHash": "sha256-hAP2ruVUWv38yy1eGd7yrcEuqlRtIMzA6ZcheN9n7qM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1d99565768b67e930e80fc8f03acea9860395da2", + "rev": "317e9986ebfbcdccfe2c105557c8d724c394843a", "type": "github" }, "original": { @@ -162,11 +162,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1739640234, - "narHash": "sha256-+o3AWAC0GICcvdn+vXGmQ5hXJSALdD3rgnt+SZLRQKU=", + "lastModified": 1740720547, + "narHash": "sha256-Vh6Wi9qANzpSBxxdZIa4Kr85cTal0Y93Q5TFKm2mC3M=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "dc10b4ba56665c66562a5e993c9734fe89c29c65", + "rev": "85902bc8c7b759080fac8906dd17298e29a3b20d", "type": "github" }, "original": { @@ -223,11 +223,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -239,11 +239,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -255,11 +255,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739484910, - "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", + "lastModified": 1740743217, + "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", + "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1740695751, + "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", "type": "github" }, "original": { @@ -319,11 +319,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739484910, - "narHash": "sha256-wjWLzdM7PIq4ZAe7k3vyjtgVJn6b0UeodtRFlM/6W5U=", + "lastModified": 1740743217, + "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b73e36b1962620a8ac551a37229dd8662dac5c8", + "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c", "type": "github" }, "original": { @@ -87,7 +87,6 @@ { hostName = "dragon"; } { hostName = "firelink"; } { hostName = "tiny1"; } - { hostName = "dex"; } ]; in builtins.listToAttrs (map mkConfig myMachines); }; diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index 1b49268..3242987 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -5,8 +5,6 @@ let ports = { { age.secrets.test-secret.file = ../secrets/test-secret.age; age.secrets.test-secret.owner = "orbekk"; - orbekk.backups.enableServer = true; - orbekk.backups.enableClient = true; orbekk.gaming.enable = true; orbekk.desktop.enable = true; diff --git a/modules/desktop.nix b/modules/desktop.nix index 0099d75..ebe30e6 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -13,14 +13,10 @@ in { programs.kdeconnect.enable = true; # Performs some setup needed by river. - programs.sway.enable = true; - programs.sway.wrapperFeatures.gtk = true; programs.xwayland.enable = true; programs.dconf.enable = true; - xdg.portal.enable = true; - xdg.portal.wlr.enable = true; - xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-kde]; + xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-kde ]; services.dbus.enable = true; services.udisks2.enable = true; @@ -37,10 +33,7 @@ in { }); }) (final: prev: { - river = final.unstable.river; lswt = final.unstable.lswt; - swayidle = final.unstable.swayidle; - swaylock = final.unstable.swaylock; }) ]; @@ -54,7 +47,6 @@ in { }; security.rtkit.enable = true; - security.pam.services.swaylock = {}; hardware.pulseaudio.enable = false; services.printing.enable = true; @@ -87,7 +79,7 @@ in { }; programs.firefox.enable = true; - programs.firefox.nativeMessagingHosts.packages = [ pkgs.tridactyl-native ]; + programs.firefox.package = pkgs.librewolf; environment.systemPackages = with pkgs; [ anki @@ -98,8 +90,6 @@ in { waybar light playerctl - swaylock - swayidle grim slurp wlr-randr @@ -188,14 +178,14 @@ in { avahi.openFirewall = true; displayManager.sddm.enable = true; - displayManager.sessionPackages = with pkgs; [ river ]; + displayManager.sddm.wayland.enable = true; xserver = { enable = true; xkb.layout = "us"; xkb.options = "caps:ctrl_modifier"; - desktopManager.plasma5 = { enable = true; }; + desktopManager.plasma6.enable = true; windowManager.xmonad = { enable = true; |