From 90d308ec7dbc02e8d557a039a123b683a34cdec1 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Thu, 29 Aug 2024 21:31:51 +0200 Subject: [PATCH] fixes for a running system --- flake.lock | 12 +++++----- flake.nix | 5 +++-- hosts/spectre-x360-2018/configuration.nix | 4 ++++ modules/home-manager/browser.nix | 13 +++++------ modules/nixos/gdm.nix | 15 +++++++++++-- modules/nixos/networks.nix | 26 ---------------------- secrets/secret1.age | Bin 0 -> 334 bytes secrets/secrets.nix | 11 +++++++++ secrets/wifi.age | Bin 0 -> 809 bytes users/remy.nix | 7 +++--- 10 files changed, 47 insertions(+), 46 deletions(-) delete mode 100644 modules/nixos/networks.nix create mode 100644 secrets/secret1.age create mode 100644 secrets/secrets.nix create mode 100644 secrets/wifi.age diff --git a/flake.lock b/flake.lock index d6c5872..7e7ec13 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724531977, - "narHash": "sha256-XROVLf9ti4rrNCFLr+DmXRZtPjCQTW4cYy59owTEmxk=", + "lastModified": 1724727824, + "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2527da1ef492c495d5391f3bcf9c1dd9f4514e32", + "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d290c5c..171e115 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,9 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # home-manager.extraSpecialArgs = inputs // specialArgs; - home-manager.users.remy = import ./users/remy.nix; + home-manager.users.remy.imports = [ + ./users/remy.nix + ]; } ]; }; diff --git a/hosts/spectre-x360-2018/configuration.nix b/hosts/spectre-x360-2018/configuration.nix index 5c3b586..c5902bb 100644 --- a/hosts/spectre-x360-2018/configuration.nix +++ b/hosts/spectre-x360-2018/configuration.nix @@ -42,6 +42,10 @@ extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. }; + + networking.networkmanager.wifi.powersave = true; + + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . system.stateVersion = "24.05"; # Did you read the comment? diff --git a/modules/home-manager/browser.nix b/modules/home-manager/browser.nix index e327094..2ea6400 100644 --- a/modules/home-manager/browser.nix +++ b/modules/home-manager/browser.nix @@ -1,4 +1,3 @@ -# See https://github.com/nix-community/home-manager/blob/master/modules/programs/browserpass.nix for a reference {pkgs, ...}: { programs.firefox = { @@ -44,12 +43,12 @@ "dom.security.https_only_mode" = true; }; - # Extensions - extensions = with pkgs.inputs.firefox-addons; [ - ublock-origin - keepassxc-browser - ghostery - ]; + # # Extensions + # extensions = with pkgs.inputs.firefox-addons; [ + # ublock-origin + # keepassxc-browser + # ghostery + # ]; }; }; } diff --git a/modules/nixos/gdm.nix b/modules/nixos/gdm.nix index be68009..ce12f74 100644 --- a/modules/nixos/gdm.nix +++ b/modules/nixos/gdm.nix @@ -18,10 +18,21 @@ gnome-photos gnome-tour gnome.geary - gnome.gedit + gedit gnome.tali gnome.gnome-music gnome.cheese - ]) + epiphany + gnome.gnome-calendar + gnome.gnome-maps + gnome.simple-scan + gnome.yelp + gnome.gnome-disk-utility + xterm + gnome.gnome-notes + gnome.gnome-weather + gnome-secrets + gnome.gnome-characters + ]); } diff --git a/modules/nixos/networks.nix b/modules/nixos/networks.nix deleted file mode 100644 index a3bb981..0000000 --- a/modules/nixos/networks.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, pkgs, ... }: - -let - networks = [ - { - ssid = "MyNetwork1"; - psk = "password1"; - } - { - ssid = "MyNetwork2"; - psk = "password2"; - } - { - ssid = "MyNetwork3"; - psk = "password3"; - } - { - ssid = "MyNetwork4"; - psk = "password4"; - } - ]; -in - -{ - networking.networkmanager.networks = networks; -} \ No newline at end of file diff --git a/secrets/secret1.age b/secrets/secret1.age new file mode 100644 index 0000000000000000000000000000000000000000..7ccbe2be786e3da6839b97646cbc0e5aee8e878e GIT binary patch literal 334 zcmZ9_Jx+sA003YIClY5@V%!=89<7DM7zvb8ex${=Xcq$%`LPt}1NvS)f(K~g8Qhz= z8s{!vz}d+-xR}P>?*gA222?Qj7dS8DY<`k0Lb_%N>YRiyqJk-CwOD~HytY>kNTJR+lC)|ioaM$n$GTTl*0D^d^u!1# zewNxYG*8)}-yR_Ne;bZfjT?{_kbSYV=X_f?@hVUmG3rFHV`;LZ(rFM|Q)powSIsaa zd^DmP5*i6OReS~)mj(+ah*fkU&Owz&PUy|}dfu0N89`ALiGAb+c0r4Esl?GlFC1_! zrFXM53DrCY#W2dcs8J)4UlMO;7klyU=kcK4JTTkc^UaH~9ldY951+o)pU2%~fB9h? L)vse`{d@ZdKnitL literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix new file mode 100644 index 0000000..1e51465 --- /dev/null +++ b/secrets/secrets.nix @@ -0,0 +1,11 @@ +let + + remy-nix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMU7pWZfs7GfFTvqljA99pJV9DGJIPH+eK6DvGqBs4pG"; + remy-arch = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOP0PZqY8/YfV0NnVbFs2fZLj+nXXVJ8bDo03TyYDfW1"; + + users = [remy-arch remy-nix]; + +in { + "secret1.age".publicKeys = users; + "wifi.age".publicKeys = users; +} \ No newline at end of file diff --git a/secrets/wifi.age b/secrets/wifi.age new file mode 100644 index 0000000000000000000000000000000000000000..b7ef7ae2fb1457fc9acb57176e3b778fdb01a417 GIT binary patch literal 809 zcmV+^1J?XuXJsvAZewzJaCB*JZZ2Gm-GEg-|GDIt6 zK|wNdcy~iaXl_w$a7B7rF?euhWNAcYMN3&LF=u2?He(7cJ|J^*Xf0)AGBq_ZIUrP4 zNJ=wNAXsI3Q+Qb~RWU?sa&K8mXk%$^WJxqsHFZ!#QZ#mTcY1bYFL+c&F;PP}3N=Yh zF*9p6NK0x zXNbo)Ls;flKdk;eZSqxbHXb;%b@XUAq(S$Z&BRxjVtGnv$p7?P2lKG9Y5VA6RR0UZ zG&DYdj|`_!Om{7q9DHk$Oz9fMJ`|Yx$X+B-&=;^mEni|UEIr#;g+Sh#^&$EDG%kF% zWu-B>=_~$-u6^#6{SdJcg3#5j{P8dNJ>J+6lMPs_vI}k9nTrk}i7N}ctMzVDO4}r! zWazgbyR$9<1;|?6D`KfJE0xPL-O>V?{lq0i+bW~1f#e+S&x+XM{XAQNYZKtqNG#9! z*wkNL0i@87r!D14B_gL!o7YS+qht?L9BwPD+Z0%F0Tp3%?R*UbM^(1{aj)kxutvZs zw6cCY>BBZpeFEBtm}F%&IP`MIpf={>lsN@8XXgmZe&bKHD_f#&gN}zb4zh^InQlVe zCSgTHJkfjT!60ooZP#a(eZRUdF4Hs{qWZ#f=RRKXcjBbOw=&A(o@P#|x|Ts*Xi#*i zH*$0DvMGUv*f3m)(y-Jnoc~93prMyxGVIhP_+D#-AW1%3PxyX8%qTL%ycPWrXy@l>tHG#0x%9Lb6d9Q_PEC$D