diff options
| -rw-r--r-- | flake.lock | 44 | ||||
| -rw-r--r-- | machines/firelink.nix | 19 |
2 files changed, 33 insertions, 30 deletions
@@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1648942457, - "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=", + "lastModified": 1652712410, + "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", "owner": "ryantm", "repo": "agenix", - "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01", + "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", "type": "github" }, "original": { @@ -24,11 +24,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1652416036, - "narHash": "sha256-cfNmuHmGwdhHB9/BT1dDxo5anYFAewuvZ/wVFDAgl8w=", + "lastModified": 1653824468, + "narHash": "sha256-LRa+HjnYGBLz2kTh4aMEImBuXv38s/FDDUq8ESd3lu0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9c90a10f7c5d4e99392090820460c1fa7486ae2c", + "rev": "8c19a841dbf438c1001fdd869612ea79e00404c0", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1652372896, - "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=", + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", "owner": "numtide", "repo": "flake-utils", - "rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1650522846, - "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=", + "lastModified": 1653463224, + "narHash": "sha256-bUxKhqZhki2vPzFTl8HOo1m7pagF7WzY1MZiso8U5ws=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6b4ebea9093c997c5f275c820e679108de4871ab", + "rev": "39a7bfc496d2ddfce73fe9542af1f2029ba4fe39", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1652231724, - "narHash": "sha256-MjalcXFZgcgchp4QqnF05JTkFBBGad5hbksA1EKoP98=", + "lastModified": 1653581809, + "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41ff747f882914c1f8c233207ce280ac9d0c867f", + "rev": "83658b28fe638a170a19b8933aa008b30640fbd1", "type": "github" }, "original": { @@ -123,10 +123,10 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1650610227, - "narHash": "sha256-ofSO6FrMfC8+wmYy6ItxOfXpN0E6sumnQYQCauMjKvM=", - "path": "/nix/store/hlw0ara6xnmqvlybgvh6a2ygjvc34n43-source", - "rev": "692729210d05e0ae2f33edfc072318520dd12666", + "lastModified": 1652182392, + "narHash": "sha256-H9Bmor+kfogrE0X7Fi5sh0gCUWDG4pnmYxedJyIT41A=", + "path": "/nix/store/w6v28zy60l6fhl8g0giqk1n4a9lshybr-source", + "rev": "aa2f845096f72dde4ad0c168eeec387cbd2eae04", "type": "path" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1652182392, - "narHash": "sha256-H9Bmor+kfogrE0X7Fi5sh0gCUWDG4pnmYxedJyIT41A=", + "lastModified": 1653565689, + "narHash": "sha256-xdJ6bmPxDPIMItZJWsDxopPXUTAFPWMkNkyOOcptWSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa2f845096f72dde4ad0c168eeec387cbd2eae04", + "rev": "9bc0e974545d5bc4c24e1ed047be0dc4e30e494b", "type": "github" }, "original": { diff --git a/machines/firelink.nix b/machines/firelink.nix index 1fdbb07..1bca789 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -54,14 +54,17 @@ in { services.joycond.enable = true; services.openssh.enable = true; - # Workaround for sddm crashing at startup. - # systemd.services.display-manager.wants = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ]; - # systemd.services.display-manager.after = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ]; - services.xserver.displayManager.defaultSession = "plasma"; - services.xserver.displayManager.autoLogin = { - enable = true; - user = "guest"; - }; + displayManager.lightdm.enable = lib.mkForce false; + displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator ]; + services.udev.packages = with pkgs; [ gnome3.gnome-settings-daemon ]; + + # services.xserver.displayManager.defaultSession = "plasma"; + # services.xserver.displayManager.autoLogin = { + # enable = true; + # user = "guest"; + # }; networking.firewall.allowedTCPPorts = [ 22 4713 ]; networking.networkmanager.enable = true; |