Update gnome settings (#2)
* Update * update rec extensions * Refactor renamed settings. * fix swap
This commit is contained in:
parent
0c43fa3396
commit
070cb4248d
5 changed files with 69 additions and 42 deletions
11
.vscode/extensions.json
vendored
11
.vscode/extensions.json
vendored
|
@ -1,8 +1,11 @@
|
||||||
{
|
{
|
||||||
"recommendations": [
|
"recommendations": [
|
||||||
"jnoortheen.nix-ide",
|
"jnoortheen.nix-ide",
|
||||||
"shipitsmarter.sops-edit",
|
"mikestead.dotenv",
|
||||||
"ionutvmi.path-autocomplete",
|
"redhat.ansible",
|
||||||
"redhat.vscode-yaml"
|
"redhat.vscode-yaml",
|
||||||
|
"signageos.signageos-vscode-sops",
|
||||||
|
"pkief.material-icon-theme",
|
||||||
|
"ms-vscode-remote.remote-ssh"
|
||||||
]
|
]
|
||||||
}
|
}
|
72
flake.lock
72
flake.lock
|
@ -82,11 +82,32 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714043624,
|
"lastModified": 1715486357,
|
||||||
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
|
"narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"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"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -249,6 +270,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"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": {
|
"locked": {
|
||||||
"lastModified": 1713638189,
|
"lastModified": 1713638189,
|
||||||
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
|
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
|
||||||
|
@ -264,13 +301,13 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714635257,
|
"lastModified": 1715534503,
|
||||||
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
|
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
|
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -280,22 +317,6 @@
|
||||||
"type": "github"
|
"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": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714825428,
|
"lastModified": 1714825428,
|
||||||
|
@ -398,13 +419,14 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
|
"home-manager-stable": "home-manager-stable",
|
||||||
"impermanence": "impermanence",
|
"impermanence": "impermanence",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nix-inspect": "nix-inspect",
|
"nix-inspect": "nix-inspect",
|
||||||
"nix-vscode-extensions": "nix-vscode-extensions",
|
"nix-vscode-extensions": "nix-vscode-extensions",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
|
@ -454,7 +476,7 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713892811,
|
"lastModified": 1713892811,
|
||||||
|
|
|
@ -26,9 +26,7 @@
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
options = [ "fmask=0077" "dmask=0077" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices =
|
swapDevices = [ ];
|
||||||
[ { device = "/dev/disk/by-uuid/e11fc7e0-7762-455f-93a2-ceb026f42cb7"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,23 +20,27 @@ in
|
||||||
|
|
||||||
# GNOME plz
|
# GNOME plz
|
||||||
services = {
|
services = {
|
||||||
|
displayManager = {
|
||||||
|
defaultSession = "gnome";
|
||||||
|
autoLogin = {
|
||||||
|
enable = true;
|
||||||
|
user = "jahanson"; # TODO move to config overlay
|
||||||
|
};
|
||||||
|
};
|
||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
displayManager =
|
xkb.layout = "us"; # `localctl` will give you
|
||||||
{
|
|
||||||
gdm.enable = true;
|
|
||||||
defaultSession = "gnome"; # TODO move to config overlay
|
|
||||||
|
|
||||||
autoLogin.enable = true;
|
displayManager = {
|
||||||
autoLogin.user = "truxnell"; # TODO move to config overlay
|
gdm.enable = true;
|
||||||
};
|
};
|
||||||
desktopManager = {
|
desktopManager = {
|
||||||
# GNOME
|
# GNOME
|
||||||
gnome.enable = true;
|
gnome.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
layout = "us"; # `localctl` will give you
|
|
||||||
};
|
};
|
||||||
|
|
||||||
udev.packages = optionals cfg.systrayicons [ pkgs.gnome.gnome-settings-daemon ]; # support appindicator
|
udev.packages = optionals cfg.systrayicons [ pkgs.gnome.gnome-settings-daemon ]; # support appindicator
|
||||||
|
|
||||||
|
|
||||||
|
@ -105,12 +109,12 @@ in
|
||||||
(with pkgs; [
|
(with pkgs; [
|
||||||
gnome-photos
|
gnome-photos
|
||||||
gnome-tour
|
gnome-tour
|
||||||
|
gedit # text editor
|
||||||
])
|
])
|
||||||
++ (with pkgs.gnome; [
|
++ (with pkgs.gnome; [
|
||||||
cheese # webcam tool
|
cheese # webcam tool
|
||||||
gnome-music
|
gnome-music
|
||||||
gnome-terminal
|
gnome-terminal
|
||||||
gedit # text editor
|
|
||||||
epiphany # web browser
|
epiphany # web browser
|
||||||
geary # email reader
|
geary # email reader
|
||||||
evince # document viewer
|
evince # document viewer
|
||||||
|
|
|
@ -30,7 +30,7 @@ in
|
||||||
# Don't bother with the lecture or the need to keep state about who's been lectured
|
# Don't bother with the lecture or the need to keep state about who's been lectured
|
||||||
sudo.extraConfig = "Defaults lecture=\"never\"";
|
sudo.extraConfig = "Defaults lecture=\"never\"";
|
||||||
|
|
||||||
pam.enableSSHAgentAuth = cfg.sshAgentAuth.enable;
|
pam.sshAgentAuth.enable = cfg.sshAgentAuth.enable;
|
||||||
|
|
||||||
# Increase open file limit for sudoers
|
# Increase open file limit for sudoers
|
||||||
pam.loginLimits = mkIf cfg.increaseWheelLoginLimits [
|
pam.loginLimits = mkIf cfg.increaseWheelLoginLimits [
|
||||||
|
|
Reference in a new issue