diff options
| -rw-r--r-- | nixos/common.nix | 5 | ||||
| -rw-r--r-- | nixos/gnome.nix | 1 | ||||
| -rw-r--r-- | nixos/kde.nix | 2 | ||||
| -rw-r--r-- | nixos/lindy.nix | 22 | ||||
| -rw-r--r-- | nixpkgs/Makefile | 4 | ||||
| -rw-r--r-- | nixpkgs/common.nix (renamed from nixpkgs/home.nix) | 5 | ||||
| -rw-r--r-- | nixpkgs/kusanagi.nix | 9 | ||||
| -rw-r--r-- | nixpkgs/lindy.nix | 7 |
8 files changed, 47 insertions, 8 deletions
diff --git a/nixos/common.nix b/nixos/common.nix index c736938..cfbc160 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,6 +1,8 @@ { config, pkgs, ... }: { + boot.supportedFilesystems = [ "ntfs" ]; + networking.networkmanager.enable = true; time.timeZone = "Europe/Paris"; @@ -106,6 +108,9 @@ spotify jellyfin-media-player nheko + gimp + inkscape + krita ]; programs.vim.defaultEditor = true; diff --git a/nixos/gnome.nix b/nixos/gnome.nix index 9d02459..fb78226 100644 --- a/nixos/gnome.nix +++ b/nixos/gnome.nix @@ -27,5 +27,6 @@ gnomeExtensions.appindicator gnomeExtensions.dash-to-panel gnome.gnome-terminal + libreoffice ]; } diff --git a/nixos/kde.nix b/nixos/kde.nix index 653a8eb..8ca19bb 100644 --- a/nixos/kde.nix +++ b/nixos/kde.nix @@ -2,5 +2,5 @@ services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; - environment.systemPackages = with pkgs.libsForQt5; [ kgpg ark ]; + environment.systemPackages = with pkgs.libsForQt5; [ kgpg ark pkgs.libreoffice-qt ]; } diff --git a/nixos/lindy.nix b/nixos/lindy.nix index 04ba248..bcc662e 100644 --- a/nixos/lindy.nix +++ b/nixos/lindy.nix @@ -12,6 +12,16 @@ ]; networking.hostName = "lindy"; + networking.hostId = "00000000"; + + # ZFS config + boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; + boot.supportedFilesystems = [ "zfs" ]; + boot.zfs.devNodes = "/dev/mapper"; + boot.zfs.extraPools = [ "Zonz" ]; + services.zfs.autoScrub.enable = true; + services.zfs.autoScrub.pools = [ "Zonz" ]; + environment.systemPackages = [ pkgs.zfs ]; # Use Grub boot.loader.grub.enable = true; @@ -19,7 +29,6 @@ boot.loader.grub.extraGrubInstallArgs = [ "--bootloader-id=NixOS" ]; boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.efi.canTouchEfiVariables = true; - boot.plymouth.enable = true; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" ]; @@ -34,19 +43,30 @@ }; }; + environment.etc.crypttab = { + enable = true; + text = '' +Kurisu UUID=f593d307-66cc-4586-a899-f1ca20d74430 /root/kurisu_key +Kogami UUID=61534c91-df18-4c71-9244-54e677f5d4fa /root/kogami_key + ''; + }; + fileSystems."/" = { device = "/dev/disk/by-uuid/2e64e6fc-ab7c-4620-b56b-faee641bd2a6"; fsType = "ext4"; + options = [ "discard" ]; }; fileSystems."/home" = { device = "/dev/disk/by-uuid/1ef4b6f4-975d-4e04-9d88-0640e83ed0b4"; fsType = "ext4"; + options = [ "discard" ]; }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/0728e7e5-8e21-44bd-9287-eb066d489a0e"; fsType = "ext4"; + options = [ "discard" ]; }; fileSystems."/boot/efi" = { diff --git a/nixpkgs/Makefile b/nixpkgs/Makefile index e99f6c2..4b3becf 100644 --- a/nixpkgs/Makefile +++ b/nixpkgs/Makefile @@ -1,3 +1,3 @@ all: - nixfmt home.nix - home-manager switch -f home.nix + nixfmt `hostname`.nix + home-manager switch -f `hostname`.nix diff --git a/nixpkgs/home.nix b/nixpkgs/common.nix index ae8bc5d..7ecdb89 100644 --- a/nixpkgs/home.nix +++ b/nixpkgs/common.nix @@ -1,6 +1,5 @@ { pkgs, ... }: { home.username = "lx"; - home.homeDirectory = "/home/lx"; programs.bash = { enable = true; @@ -12,7 +11,7 @@ programs.keychain = { enable = true; enableBashIntegration = true; - keys = [ "/home/lx/.ssh/id_ed25519" ]; + keys = [ "~/.ssh/id_ed25519" ]; }; programs.vim = { enable = true; @@ -30,7 +29,6 @@ xdg.enable = true; xdg.userDirs = { - download = "/home/lx/Downloads"; desktop = null; documents = null; pictures = null; @@ -46,4 +44,3 @@ home.stateVersion = "22.11"; } - diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix new file mode 100644 index 0000000..6757886 --- /dev/null +++ b/nixpkgs/kusanagi.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: { + imports = [ + ./common.nix + ]; + + home.homeDirectory = "/home/lx"; + xdg.userDirs.download = "/home/lx/Downloads"; +} + diff --git a/nixpkgs/lindy.nix b/nixpkgs/lindy.nix new file mode 100644 index 0000000..1dbc65f --- /dev/null +++ b/nixpkgs/lindy.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + imports = [ ./common.nix ]; + + home.homeDirectory = "/home/lx.nix"; + xdg.userDirs.download = "/home/lx.nix/Downloads"; +} + |