diff --git a/disko/GLaDOS/default.nix b/disko/GLaDOS/default.nix index c605347..42aeb33 100644 --- a/disko/GLaDOS/default.nix +++ b/disko/GLaDOS/default.nix @@ -1,9 +1,9 @@ { disko.devices = { disk = { - sda1 = { + main = { type = "disk"; - device = "/dev/disk/by-path/pci-0000:06:00.0-ata-6"; + device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1"; content = { type = "gpt"; partitions = { @@ -14,64 +14,45 @@ type = "filesystem"; format = "vfat"; mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "umask=0077" ]; }; }; - luks = { + nvme_luks = { size = "100%"; content = { type = "luks"; - name = "crypted"; - extraOpenArgs = []; + name = "nvme_crypted"; + extraOpenArgs = [ ]; settings = { # if you want to use the key for interactive login be sure there is no trailing newline # for example use `echo -n "password" > /tmp/secret.key` #keyFile = "/tmp/secret.key"; allowDiscards = true; }; - #additionalKeyFiles = ["/tmp/additionalSecret.key"]; content = { type = "lvm_pv"; - vg = "pool"; + vg = "nvme_pool"; }; }; }; }; }; }; - #sdc = { - #device = "/dev/disk/by-path/pci-0000:06:00.0-ata-2"; - #type = "disk"; - #content = { - #type = "gpt"; - #partitions = { - #root = { - #size = "100%"; - #content = { - #type = "filesystem"; - #format = "ext4"; - #mountpoint = "/media"; - #}; - #}; - #}; - #}; - #}; }; lvm_vg = { - pool = { + nvme_pool = { type = "lvm_vg"; lvs = { - swap = { - size = "16G"; + nvme_swap = { + size = "32G"; content = { type = "swap"; + discardPolicy = "both"; resumeDevice = true; # resume from hiberation from this device }; }; - root = { - size = "100%FREE"; + nvme_root = { + size = "100%"; content = { type = "filesystem"; format = "ext4"; @@ -84,13 +65,5 @@ }; }; }; - nodev = { - "/home/lillian/Downloads" = { - fsType = "tmpfs"; - mountOptions = [ - "size=4G" - ]; - }; - }; }; } diff --git a/home-manager/desktop/package-configs/plasma-desktop/default.nix b/home-manager/desktop/package-configs/plasma-desktop/default.nix index 7cae27a..ee3c721 100644 --- a/home-manager/desktop/package-configs/plasma-desktop/default.nix +++ b/home-manager/desktop/package-configs/plasma-desktop/default.nix @@ -93,6 +93,8 @@ hidden = [ "Xwayland Video Bridge_pipewireToXProxy" "org.kde.plasma.devicenotifier" + "org.kde.plasma.keyboardindicator" + "org.kde.plasma.keyboardlayout" "org.kde.kscreen" "org.kde.plasma.printmanager" "chrome_status_icon_1" @@ -100,6 +102,7 @@ "Nitrokey App" "qBittorrent" "vlc" + "obs" "steam" "nitrokey-app" ]; diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix index 1922c62..5aa1c76 100644 --- a/home-manager/hosts/EDI/lillian.nix +++ b/home-manager/hosts/EDI/lillian.nix @@ -16,6 +16,7 @@ ]; home.packages = with pkgs; [ + lutris ]; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix index a750ab7..fbb0ea7 100644 --- a/nixos/desktop/default.nix +++ b/nixos/desktop/default.nix @@ -107,8 +107,8 @@ programs = { # Allow executing of anything on the system with a , eg: , python executes python from the nix store even if not in $PATH currently command-not-found.enable = lib.mkForce false; - # nix-index.enable = true; - # nix-index-database.comma.enable = true; + nix-index.enable = true; + nix-index-database.comma.enable = true; direnv = { enable = true; diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix index ee0bf07..adf2633 100644 --- a/nixos/hosts/GLaDOS/configuration.nix +++ b/nixos/hosts/GLaDOS/configuration.nix @@ -31,6 +31,7 @@ ]; environment.systemPackages = with pkgs; [ + gparted ]; services.vpn-ip = {