From 070cb4248d353a61487c124410a6a1d893c913b6 Mon Sep 17 00:00:00 2001 From: Joe Hanson Date: Mon, 13 May 2024 11:11:19 -0500 Subject: [PATCH] Update gnome settings (#2) * Update * update rec extensions * Refactor renamed settings. * fix swap --- .vscode/extensions.json | 11 ++-- flake.lock | 72 ++++++++++++++++--------- nixos/hosts/durincore/default.nix | 4 +- nixos/modules/nixos/de/gnome.nix | 22 ++++---- nixos/modules/nixos/system/security.nix | 2 +- 5 files changed, 69 insertions(+), 42 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 622c6ae..0f60a5f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,8 +1,11 @@ { "recommendations": [ "jnoortheen.nix-ide", - "shipitsmarter.sops-edit", - "ionutvmi.path-autocomplete", - "redhat.vscode-yaml" + "mikestead.dotenv", + "redhat.ansible", + "redhat.vscode-yaml", + "signageos.signageos-vscode-sops", + "pkief.material-icon-theme", + "ms-vscode-remote.remote-ssh" ] -} +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index 4865dfc..43dfe9a 100644 --- a/flake.lock +++ b/flake.lock @@ -82,11 +82,32 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-stable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -249,6 +270,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1715395895, + "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1713638189, "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", @@ -264,13 +301,13 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "type": "github" }, "original": { @@ -280,22 +317,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1714685007, - "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1714825428, @@ -398,13 +419,14 @@ "root": { "inputs": { "home-manager": "home-manager", + "home-manager-stable": "home-manager-stable", "impermanence": "impermanence", "nix-index-database": "nix-index-database", "nix-inspect": "nix-inspect", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "sops-nix": "sops-nix" } @@ -454,7 +476,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1713892811, diff --git a/nixos/hosts/durincore/default.nix b/nixos/hosts/durincore/default.nix index 00c93dd..04eeeb8 100644 --- a/nixos/hosts/durincore/default.nix +++ b/nixos/hosts/durincore/default.nix @@ -26,9 +26,7 @@ options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/e11fc7e0-7762-455f-93a2-ceb026f42cb7"; } - ]; + swapDevices = [ ]; }; } diff --git a/nixos/modules/nixos/de/gnome.nix b/nixos/modules/nixos/de/gnome.nix index 18293b5..7006c36 100644 --- a/nixos/modules/nixos/de/gnome.nix +++ b/nixos/modules/nixos/de/gnome.nix @@ -20,23 +20,27 @@ in # GNOME plz services = { + displayManager = { + defaultSession = "gnome"; + autoLogin = { + enable = true; + user = "jahanson"; # TODO move to config overlay + }; + }; xserver = { enable = true; - displayManager = - { - gdm.enable = true; - defaultSession = "gnome"; # TODO move to config overlay + xkb.layout = "us"; # `localctl` will give you - autoLogin.enable = true; - autoLogin.user = "truxnell"; # TODO move to config overlay - }; + displayManager = { + gdm.enable = true; + }; desktopManager = { # GNOME gnome.enable = true; }; - layout = "us"; # `localctl` will give you }; + udev.packages = optionals cfg.systrayicons [ pkgs.gnome.gnome-settings-daemon ]; # support appindicator @@ -105,12 +109,12 @@ in (with pkgs; [ gnome-photos gnome-tour + gedit # text editor ]) ++ (with pkgs.gnome; [ cheese # webcam tool gnome-music gnome-terminal - gedit # text editor epiphany # web browser geary # email reader evince # document viewer diff --git a/nixos/modules/nixos/system/security.nix b/nixos/modules/nixos/system/security.nix index 774860d..6c4af18 100644 --- a/nixos/modules/nixos/system/security.nix +++ b/nixos/modules/nixos/system/security.nix @@ -30,7 +30,7 @@ in # Don't bother with the lecture or the need to keep state about who's been lectured sudo.extraConfig = "Defaults lecture=\"never\""; - pam.enableSSHAgentAuth = cfg.sshAgentAuth.enable; + pam.sshAgentAuth.enable = cfg.sshAgentAuth.enable; # Increase open file limit for sudoers pam.loginLimits = mkIf cfg.increaseWheelLoginLimits [