diff --git a/flake.nix b/flake.nix index 807d4f6..4e7df3c 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,11 +140,25 @@ ./nixos/zerotier.nix ]; }; - gwen = nixpkgs.lib.nixosSystem { + selaphiel = nixpkgs.lib.nixosSystem { + #Ingrid thinkpad t480 specialArgs = { inherit inputs outputs; - hostname = "gwen"; - mainUser = "gwen"; + hostname = "selaphiel"; + mainUser = "ingrid"; + }; + modules = [ + ./nixos/configuration.nix + ./nixos/kde-desktop.nix + ./nixos/family.nix + ./nixos/zerotier.nix + ./nixos/gaming.nix + ]; + }; + chamuel = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs outputs; + hostname = "chamuel"; }; modules = [ ./nixos/configuration.nix diff --git a/home-manager/traverseda/home.nix b/home-manager/traverseda/home.nix index 919845b..8a0d85e 100644 --- a/home-manager/traverseda/home.nix +++ b/home-manager/traverseda/home.nix @@ -311,6 +311,7 @@ pkgs.copier pkgs.pv #pkgs.poetry + pkgs.lazydocker pkgs.nmap pkgs.dig pkgs.tree 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/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/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 ]; } diff --git a/nixos/hardware/chamuel.nix b/nixos/hardware/chamuel.nix new file mode 100644 index 0000000..aae306d --- /dev/null +++ b/nixos/hardware/chamuel.nix @@ -0,0 +1,38 @@ +# 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" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/946dac58-4ad2-463d-b0a4-46064a3e9e2f"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/6D60-03A9"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # 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.enp0s25.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} 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 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; +} diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index 0eb512d..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; @@ -39,6 +40,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 @@ -55,6 +65,7 @@ pkgs.iw pkgs.vlc pkgs.signal-desktop + pkgs.anki ]; programs.dconf.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 { diff --git a/nixos/zerotier.nix b/nixos/zerotier.nix index 9849d8b..38718b1 100644 --- a/nixos/zerotier.nix +++ b/nixos/zerotier.nix @@ -5,7 +5,7 @@ let in { networking.firewall.trustedInterfaces = privateZeroTierInterfaces; # TRUST VPN ONLY - + services.avahi = { enable = true; #allowInterfaces = privateZeroTierInterfaces; # ONLY BROADCAST ON VPN @@ -18,7 +18,7 @@ in { publish.workstation = true; # ADDED TO DESKTOP MACHINES cacheEntriesMax = 512; }; - + systemd.services.createDevicemap = { description = "Create ZeroTier devicemap file"; before = [ "zerotierone.service" ]; # Ensure ZeroTier service has started diff --git a/pkgs/creality-print/default.nix b/pkgs/creality-print/default.nix index cb24ac0..ef26336 100644 --- a/pkgs/creality-print/default.nix +++ b/pkgs/creality-print/default.nix @@ -18,32 +18,39 @@ let multiPkgs = pkgs: with pkgs; [ qt5.qtbase libGL libz ]; }; - # Create a desktop entry for Creality Print - desktopItem = pkgs.makeDesktopItem { - name = "creality-print"; - exec = "${creality-print}/bin/creality-print"; - icon = "creality-print"; - desktopName = "Creality Print"; - genericName = "3D Printer Software"; - categories = [ "Graphics" ]; - }; - in # Define the package pkgs.stdenv.mkDerivation { name = "creality-print"; - buildInputs = [ creality-print ]; + buildInputs = [ creality-print pkgs.bash ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper pkgs.icoutils pkgs.unpacker ]; # No sources to unpack unpackPhase = "true"; - # Installation phase + # Extraction phase to get the icon from the AppImage installPhase = '' - mkdir -p $out/bin $out/share/applications + mkdir -p $out/bin $out/share/applications $out/share/icons/hicolor/256x256/apps + + # Extract the AppImage content + appimage-extract ${creality-print}/bin/creality-print + + # Find and copy the icon (typically the largest icon available) + cp ./squashfs-root/*.png $out/share/icons/hicolor/256x256/apps/creality-print.png || true + + # Copy the binary files cp ${creality-print}/bin/* $out/bin - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + # Create the desktop entry with the extracted icon + cat > $out/share/applications/creality-print.desktop <