diff --git a/config/default.nix b/config/default.nix index 06a46c1..e545082 100755 --- a/config/default.nix +++ b/config/default.nix @@ -1,7 +1,6 @@ {lib, ...}: let deviceNames = [ "desktop" - "fallaryn" "laptop" "nas" "phone" @@ -36,8 +35,6 @@ userNames = [ "user0" "user1" - "user2" - "user3" ]; stringType = lib.mkOption { type = lib.types.str; diff --git a/config/device.nix b/config/device.nix index 49146bb..2b934cb 100755 --- a/config/device.nix +++ b/config/device.nix @@ -77,12 +77,8 @@ in { nas = let user0 = "nick"; user1 = "garnet"; - user2 = "fallaryn"; - user3 = "denise"; user0Name = "Nick"; user1Name = "Garnet"; - user2Name = "Fallaryn"; - user3Name = "Denise"; nasName = "synology"; nasIP = "192.168.50.210"; in { @@ -104,18 +100,6 @@ in { device = "//${nasIP}/homes/${user1Name}"; options = sambaPermissions ++ userIdForUser1; }; - # Fallaryn Home Folder - folder2 = { - mount = "/mnt/media/${nasName}/${user2}"; - device = "//${nasIP}/homes/${user2Name}"; - options = sambaPermissions ++ userIdForUser0; - }; - # Denise Home Folder - folder3 = { - mount = "/mnt/media/${nasName}/${user3}"; - device = "//${nasIP}/homes/${user3Name}"; - options = sambaPermissions ++ userIdForUser0; - }; # Minecraft Worlds folder4 = { mount = "/home/${user1}/.local/share/PrismLauncher/instances/1.21/.minecraft/saves"; @@ -124,29 +108,6 @@ in { }; }; - # Fallaryn Desktop - - fallaryn = { - label = "fallaryn"; - name = "fallaryn"; - ip = { - address0 = ""; - }; - boot = { - options = ownerWriteOthersReadMask; - }; - storage0 = { - mount = "/run/media/games"; - device = "/dev/disk/by-label/Games"; - options = readWritePermissions; - }; - storage1 = { - mount = "/run/media/entertainment"; - device = "/dev/disk/by-label/Entertainment"; - options = readWritePermissions; - }; - }; - # Pixel 9 phone = { diff --git a/config/user.nix b/config/user.nix index 0e2955b..f923b63 100755 --- a/config/user.nix +++ b/config/user.nix @@ -1,14 +1,10 @@ let user0 = "nick"; user1 = "garnet"; - user2 = "fallaryn"; - user3 = "denise"; in { inherit user0 user1 - user2 - user3 ; user = { "${user0}" = { @@ -36,17 +32,5 @@ in { address0 = "ninaeffler@gmail.com"; }; }; - "${user2}" = { - name = "Fallaryn"; - email = { - address0 = "staciesimonson@gmail.com"; - }; - }; - "${user3}" = { - name = "Denise"; - email = { - address0 = "denisehiebert@shaw.ca"; - }; - }; }; } diff --git a/flake.nix b/flake.nix index fc1a01f..a3f49b5 100755 --- a/flake.nix +++ b/flake.nix @@ -54,21 +54,10 @@ inputs.nur.nixosModules.nur inputs.sops-nix.nixosModules.sops ]; - fallaryn = inputs.self.lib.mkLinuxSystem [ - ./systems/fallaryn - ./profiles/user2 - config.nixosModules.personal - config.nixosModules.shared - inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default - inputs.nur.nixosModules.nur - inputs.sops-nix.nixosModules.sops - ]; laptop = inputs.self.lib.mkLinuxSystem [ ./systems/laptop ./profiles/user0 ./profiles/user1 - ./profiles/user2 config.nixosModules.personal config.nixosModules.shared inputs.home-manager.nixosModules.home-manager @@ -85,7 +74,6 @@ inputs.lix-module.nixosModules.default inputs.ngipkgs.nixosModules."services.peertube" inputs.ngipkgs.nixosModules.default - inputs.nur.nixosModules.nur inputs.sops-nix.nixosModules.sops ]; }; diff --git a/profiles/user2/configs/fallaryn.nix b/profiles/user2/configs/fallaryn.nix deleted file mode 100755 index 760e1f4..0000000 --- a/profiles/user2/configs/fallaryn.nix +++ /dev/null @@ -1,22 +0,0 @@ -{flake, ...}: let - inherit (flake) self; - moduleNames = [ - "commandLine" - "entertainment" - "extras" - "fileManagement" - "internet" - "internetExtras" - "productionArt" - "productionArtExtras" - "productionAudio" - "productionCode" - "productionVideo" - "productionWriting" - "wpsOffice" - ]; - - moduleImports = map (module: self.homeModules.${module}) moduleNames; -in { - imports = moduleImports; -} diff --git a/profiles/user2/configs/laptop.nix b/profiles/user2/configs/laptop.nix deleted file mode 100755 index 81d09fc..0000000 --- a/profiles/user2/configs/laptop.nix +++ /dev/null @@ -1,16 +0,0 @@ -{flake, ...}: let - inherit (flake) self; - moduleNames = [ - "commandLine" - "entertainment" - "extras" - "fileManagement" - "internet" - "internetExtras" - "wpsOffice" - ]; - - moduleImports = map (module: self.homeModules.${module}) moduleNames; -in { - imports = moduleImports; -} diff --git a/profiles/user2/default.nix b/profiles/user2/default.nix deleted file mode 100755 index 54b2ae0..0000000 --- a/profiles/user2/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - config, - flake, - pkgs, - ... -}: let - hostname = config.networking.hostName; - inherit (flake.config.people) user2; - inherit (flake.config.people.user.${user2}) name; -in { - users = { - users.${user2} = { - description = name; - isNormalUser = true; - shell = pkgs.nushell; - extraGroups = [ - "libvirtd" - "disk" - "networkmanager" - "vboxusers" - "wheel" - "adbusers" - "netdev" - ]; - }; - }; - home-manager.users = { - ${user2} = { - home = { - username = user2; - homeDirectory = "/home/${user2}"; - file = { - "./justfile" = { - source = ./files/justfile; - }; - }; - sessionVariables = {}; - }; - imports = [ - {home.stateVersion = config.system.stateVersion;} - (import ./configs/${hostname}.nix {flake = flake;}) - ]; - }; - }; -} diff --git a/profiles/user2/files/justfile b/profiles/user2/files/justfile deleted file mode 100755 index bb2295b..0000000 --- a/profiles/user2/files/justfile +++ /dev/null @@ -1,14 +0,0 @@ -ewwEdit: - eww --config /home/nick/dotfiles/home-manager/modules/eww/config/ open centerPanel - -ewwLaunch: - ./home/nick/dotfiles/home-manager/modules/eww/config/scripts/master.sh - -gobrrr: - home-manager switch --flake ~/dotfiles#desktop - -gobrrrl: - nixos-rebuild switch --use-remote-sudo --flake /home/nick/dotfiles#desktop - -fuckoff: - shutdown now diff --git a/systems/fallaryn/boot.nix b/systems/fallaryn/boot.nix deleted file mode 100755 index 7c28a4e..0000000 --- a/systems/fallaryn/boot.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - pkgs, - config, - ... -}: { - boot = { - extraModulePackages = [ - config.boot.kernelPackages.v4l2loopback.out - ]; - supportedFilesystems = ["ntfs"]; - initrd = { - availableKernelModules = ["amdgpu" "nvme" "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod"]; - kernelModules = []; - }; - - kernelModules = ["kvm-amd" "vfio-pci" "v4l2loopback"]; - - kernelPackages = pkgs.linuxPackages_latest; - - loader = { - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - systemd-boot.enable = false; - grub = { - enable = true; - device = "nodev"; - useOSProber = true; - efiSupport = true; - }; - }; - }; -} diff --git a/systems/fallaryn/default.nix b/systems/fallaryn/default.nix deleted file mode 100755 index e457f72..0000000 --- a/systems/fallaryn/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{lib, ...}: { - imports = [ - ./boot.nix - ./filesystem.nix - ./graphics.nix - ./hardware.nix - ./networking.nix - ./sops.nix - ]; - nixpkgs.hostPlatform = lib.mkForce "x86_64-linux"; - system.stateVersion = lib.mkForce "24.05"; -} diff --git a/systems/fallaryn/filesystem.nix b/systems/fallaryn/filesystem.nix deleted file mode 100755 index 8648aa2..0000000 --- a/systems/fallaryn/filesystem.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - config, - flake, - ... -}: let - inherit (flake.config.people) user2; - inherit (flake.config.system.device) fallaryn nas; - synologySecrets = config.sops.secrets."network/fallaryn".path; -in { - imports = []; - - fileSystems = let - synologyDrives = [ - "folder2" - ]; - - storageDrives = [ - "storage0" - "storage1" - ]; - - synologyMounts = folder: { - name = "${nas.${folder}.mount}"; - value = { - device = nas.${folder}.device; - fsType = "cifs"; - options = nas.${folder}.options ++ ["credentials=${synologySecrets}"]; - }; - }; - - storageMounts = storage: { - name = "${fallaryn.${storage}.mount}"; - value = { - device = fallaryn.${storage}.device; - fsType = "ext4"; - options = fallaryn.${storage}.options; - }; - }; - in - { - "/" = { - device = "/dev/disk/by-uuid/d02cb367-26e0-4708-8840-75dcc4362ff4"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/22BD-5A25"; - fsType = "vfat"; - options = fallaryn.boot.options; - }; - } - // (builtins.listToAttrs (map synologyMounts synologyDrives)) - // (builtins.listToAttrs (map storageMounts storageDrives)); - - swapDevices = [ - {device = "/dev/disk/by-uuid/cc7ab213-26c9-4567-91ca-9dba6e98c9d1";} - ]; - - systemd.tmpfiles.rules = [ - "Z ${config.home-manager.users.${user2}.home.homeDirectory} 0755 ${user2} users -" - "Z ${fallaryn.storage0.mount} 0755 ${user2} users -" - "Z ${fallaryn.storage1.mount} 0755 ${user2} users -" - ]; - - services.udisks2.enable = true; -} diff --git a/systems/fallaryn/graphics.nix b/systems/fallaryn/graphics.nix deleted file mode 100755 index 2ef537d..0000000 --- a/systems/fallaryn/graphics.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - hardware = { - graphics = { - enable = true; - extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - rocmPackages.clr.icd - pkgs.amdvlk - ]; - extraPackages32 = [ - pkgs.driversi686Linux.amdvlk - ]; - }; - }; - boot.initrd.kernelModules = ["amdgpu"]; -} diff --git a/systems/fallaryn/hardware.nix b/systems/fallaryn/hardware.nix deleted file mode 100755 index e82691c..0000000 --- a/systems/fallaryn/hardware.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - hardware = { - firmware = [pkgs.rtl8761b-firmware]; - enableAllFirmware = true; - cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - }; -} diff --git a/systems/fallaryn/networking.nix b/systems/fallaryn/networking.nix deleted file mode 100755 index 6631daa..0000000 --- a/systems/fallaryn/networking.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - flake, - ... -}: let - inherit (flake.config.system.device) fallaryn; -in { - networking = { - hostName = fallaryn.name; - networkmanager.enable = true; - useDHCP = lib.mkDefault true; - firewall = { - enable = true; - allowedTCPPorts = []; - }; - }; - services = { - avahi = { - enable = true; - openFirewall = true; - nssmdns4 = true; - }; - sshd.enable = true; - openssh = { - enable = true; - settings.PasswordAuthentication = false; - }; - }; -} diff --git a/systems/fallaryn/sops.nix b/systems/fallaryn/sops.nix deleted file mode 100755 index e234e30..0000000 --- a/systems/fallaryn/sops.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - sops = { - secrets = { - "network/fallaryn" = { - path = "/etc/fallaryn-synology"; - owner = "root"; - mode = "600"; - }; - }; - }; -}