From 0528a60060b7bb0d968cb5d204fdd528f169ea19 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Sat, 24 Aug 2024 08:25:43 -0300 Subject: [PATCH 1/7] Added lazydocker --- flake.lock | 18 +++++++++--------- home-manager/traverseda/home.nix | 1 + nixos/kde-desktop.nix | 1 + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index bf0a7e0..c1b7b93 100644 --- a/flake.lock +++ b/flake.lock @@ -354,11 +354,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "lastModified": 1722987190, + "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "type": "github" }, "original": { @@ -422,11 +422,11 @@ ] }, "locked": { - "lastModified": 1723036961, - "narHash": "sha256-GLrZ8CE2FlWbeJFFcO+J5nphbOG8d0eslpy8Uv+AHoY=", + "lastModified": 1723232379, + "narHash": "sha256-F4Y3f9305aHGWKqAd3s2GyNRONdpDBuNuK4TCSdaHz8=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b6e7a2ed7b22effe1395416adf527935c4b3dc9b", + "rev": "22bea90404c5ff6457913a03c1a54a3caa5b1c57", "type": "github" }, "original": { diff --git a/home-manager/traverseda/home.nix b/home-manager/traverseda/home.nix index a150b90..98aa09a 100644 --- a/home-manager/traverseda/home.nix +++ b/home-manager/traverseda/home.nix @@ -314,6 +314,7 @@ pkgs.copier pkgs.pv #pkgs.poetry + pkgs.lazydocker pkgs.nmap pkgs.dig pkgs.tree diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index 0eb512d..34ddaa5 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -55,6 +55,7 @@ pkgs.iw pkgs.vlc pkgs.signal-desktop + pkgs.anki ]; programs.dconf.enable = true; From b7fe8183e26502e1e65393339d5c45ff20ea8017 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Sat, 14 Sep 2024 09:29:53 -0300 Subject: [PATCH 2/7] Added laptop for ingridi --- flake.nix | 17 ++++++++++++++++- hostnames.md | 2 +- nixos/gaming.nix | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 807d4f6..2257d53 100644 --- a/flake.nix +++ b/flake.nix @@ -85,7 +85,7 @@ # NixOS configuration entrypoint nixosConfigurations = { - #Personal laptop, thinkpad t490 + #Traverse's laptop, thinkpad t490 athame = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; @@ -140,6 +140,21 @@ ./nixos/zerotier.nix ]; }; + selaphiel = nixpkgs.lib.nixosSystem { + #Ingrid thinkpad t480 + specialArgs = { + inherit inputs outputs; + hostname = "Selaphiel"; + mainUser = "ingrid"; + }; + modules = [ + ./nixos/configuration.nix + ./nixos/kde-desktop.nix + ./nixos/family.nix + ./nixos/zerotier.nix + ./nixos/gaming.nix + ]; + }; gwen = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; diff --git a/hostnames.md b/hostnames.md index 9ff260e..002e26a 100644 --- a/hostnames.md +++ b/hostnames.md @@ -14,7 +14,7 @@ Jeremiel #Metatron Sandalphon Sariel -Selaphiel +#Selaphiel Barachiel Zaphkiel Gadreel diff --git a/nixos/gaming.nix b/nixos/gaming.nix index 31e6d95..b268e9e 100644 --- a/nixos/gaming.nix +++ b/nixos/gaming.nix @@ -8,6 +8,7 @@ }; environment.systemPackages = with pkgs; [ + pkgs.discord ]; } From 015506c0a930c855e8a98633c574640d6e9e0595 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Sat, 14 Sep 2024 13:57:45 +0000 Subject: [PATCH 3/7] Added ingrid thinkpad t470 --- flake.nix | 2 +- nixos/hardware/selaphiel.nix | 41 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 nixos/hardware/selaphiel.nix diff --git a/flake.nix b/flake.nix index 2257d53..2149042 100644 --- a/flake.nix +++ b/flake.nix @@ -144,7 +144,7 @@ #Ingrid thinkpad t480 specialArgs = { inherit inputs outputs; - hostname = "Selaphiel"; + hostname = "selaphiel"; mainUser = "ingrid"; }; modules = [ diff --git a/nixos/hardware/selaphiel.nix b/nixos/hardware/selaphiel.nix new file mode 100644 index 0000000..a0baad7 --- /dev/null +++ b/nixos/hardware/selaphiel.nix @@ -0,0 +1,41 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/1c4d73a3-ce64-42c8-beda-b27e085a80c1"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/B16C-FE36"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/24533029-c0f8-44d7-b3f5-12a5e5327ed1"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From 03eb3b604aae3f69cf10e5d7170db84fa694f82f Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Sat, 14 Sep 2024 12:08:38 -0300 Subject: [PATCH 4/7] Rename gwen to chamuel and generize it --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 2257d53..49ffaaf 100644 --- a/flake.nix +++ b/flake.nix @@ -155,11 +155,10 @@ ./nixos/gaming.nix ]; }; - gwen = nixpkgs.lib.nixosSystem { + chamuel = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; - hostname = "gwen"; - mainUser = "gwen"; + hostname = "chamuel"; }; modules = [ ./nixos/configuration.nix From c87bb2a81d9e6d2dab603e67e64a677e9d2e353d Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Sat, 14 Sep 2024 12:32:50 -0300 Subject: [PATCH 5/7] Enable flatpak repo --- nixos/kde-desktop.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index 34ddaa5..c63d101 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -39,6 +39,15 @@ services.printing.enable = true; programs.kdeconnect.enable = true; + #Enable flatpak repo by default for all users + systemd.services.flatpak-repo = { + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.flatpak ]; + script = '' + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + ''; + }; + environment.systemPackages = with pkgs; [ pkgs.krfb pkgs.krdc From 12d4f463674fc1da45ffa6575decce38ee764406 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Sun, 15 Sep 2024 07:33:51 -0300 Subject: [PATCH 6/7] Fixed printers for regular users --- nixos/configuration.nix | 8 ++++++++ nixos/family.nix | 6 +++--- nixos/kde-desktop.nix | 1 + nixos/misc/wifi-multiplex.nix | 4 +--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 5cb1982..3112240 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -186,6 +186,14 @@ programs.nix-ld.libraries = with pkgs; [ ]; + #Create ldpadmin group for printer access + services.printing.extraFilesConf = '' + SystemGroup root wheel lpadmin + ''; + users.groups = { + lpadmin = { }; + }; + # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion system.stateVersion = "23.05"; } diff --git a/nixos/family.nix b/nixos/family.nix index 4b733f8..13c40f1 100644 --- a/nixos/family.nix +++ b/nixos/family.nix @@ -12,15 +12,15 @@ in users.users = { gwen = { isNormalUser = true; - extraGroups = [ "networkManager" ]; + extraGroups = [ "networkManager" "lpadmin" ]; }; ingrid = { isNormalUser = true; - extraGroups = [ "networkManager" ]; + extraGroups = [ "networkManager" "lpadmin" ]; }; bill = { isNormalUser = true; - extraGroups = [ "networkManager" ]; + extraGroups = [ "networkManager" "lpadmin" ]; }; logic11 = { isNormalUser = true; diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index c63d101..4eebafd 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -3,6 +3,7 @@ { imports = [ ./misc/dslr-webcam.nix + ./misc/wifi-multiplex.nix ]; # Enable the KDE Desktop Environment. services.xserver.enable = true; diff --git a/nixos/misc/wifi-multiplex.nix b/nixos/misc/wifi-multiplex.nix index 813c827..6b92b1f 100644 --- a/nixos/misc/wifi-multiplex.nix +++ b/nixos/misc/wifi-multiplex.nix @@ -1,10 +1,8 @@ - { pkgs, lib, ... }: let wifiUdevRule = '' - ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", ENV{ID_NET_NAME_MAC}=="", RUN+="/bin/sh -c '${pkgs.iw}/bin/iw dev %k interface add %k_ap type station'" - + ACTION=="add", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", KERNEL!="virt_", RUN+="${pkgs.iw}/bin/iw dev %k interface add virt_%k_ap type station" ''; in { From 1da8bcdfd560d4603d6599fb3041bb8fdd480a16 Mon Sep 17 00:00:00 2001 From: Alex Davies Date: Tue, 17 Sep 2024 21:39:22 +0000 Subject: [PATCH 7/7] Fixed hearth hardware config --- nixos/hardware/hearth.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/hardware/hearth.nix b/nixos/hardware/hearth.nix index a1e1dd3..8f342e6 100644 --- a/nixos/hardware/hearth.nix +++ b/nixos/hardware/hearth.nix @@ -14,17 +14,17 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/50ac51e9-5ac3-4f11-ae92-f3d43b5b602e"; + { device = "/dev/disk/by-uuid/df5a8047-3bbb-4a48-9b9e-5ffa8b292339"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F953-8DA5"; - fsType = "vfat"; - }; - + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F953-8DA5"; + fsType = "vfat"; + }; + swapDevices = - [ { device = "/dev/disk/by-uuid/067ac10e-d118-4e8c-bbe8-01ac99065024"; } + [ { device = "/dev/disk/by-uuid/c66d85ae-e3b7-4aee-a457-d13cfe87ec84"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking