From ff6a56b52b22db67387700f87c15a2778c21f4da Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 13 Oct 2024 15:11:21 +0300 Subject: [PATCH] feat : new dragon machine + add nixin --- dotfiles/init_yeswiki_repos.sh | 2 ++ .../configuration.nix} | 12 ++++++------ .../hardware-configuration.nix} | 16 +++++++++------- 3 files changed, 17 insertions(+), 13 deletions(-) mode change 100644 => 100755 dotfiles/init_yeswiki_repos.sh rename machines/{Segotep-desktop-tower-configuration.nix => dragon/configuration.nix} (94%) rename machines/{Segotep-desktop-tower-hardware-configuration.nix => dragon/hardware-configuration.nix} (72%) diff --git a/dotfiles/init_yeswiki_repos.sh b/dotfiles/init_yeswiki_repos.sh old mode 100644 new mode 100755 index 9367ddf..e923eea --- a/dotfiles/init_yeswiki_repos.sh +++ b/dotfiles/init_yeswiki_repos.sh @@ -75,4 +75,6 @@ printf "================ End install YesWiki misc from forge.mrflos.pw ========= printf "\n================ Install other projects ================\n" dir="framemo" [ ! -d $curdir/$dir ] && git clone ssh://git@framagit.org/colibris/framemo.git +dir="nixin-web" +[ ! -d $curdir/$dir ] && git clone ssh://forgejo@git.distrilab.fr:NixiN/nixin-web.git printf "================ End install other projects ============\n" diff --git a/machines/Segotep-desktop-tower-configuration.nix b/machines/dragon/configuration.nix similarity index 94% rename from machines/Segotep-desktop-tower-configuration.nix rename to machines/dragon/configuration.nix index 2005eb8..6821814 100644 --- a/machines/Segotep-desktop-tower-configuration.nix +++ b/machines/dragon/configuration.nix @@ -102,12 +102,12 @@ # services.xserver.libinput.enable = true; imports = [ - ../modules/console.nix - ../modules/desktop.nix - ../modules/fonts.nix - ../modules/home-config.nix - ../modules/local-dev.nix - ../modules/nixos.nix + ../../modules/console.nix + ../../modules/desktop.nix + ../../modules/fonts.nix + ../../modules/home-config.nix + ../../modules/local-dev.nix + ../../modules/nixos.nix ]; # This value determines the NixOS release from which the default diff --git a/machines/Segotep-desktop-tower-hardware-configuration.nix b/machines/dragon/hardware-configuration.nix similarity index 72% rename from machines/Segotep-desktop-tower-hardware-configuration.nix rename to machines/dragon/hardware-configuration.nix index 8c51513..6597f26 100644 --- a/machines/Segotep-desktop-tower-hardware-configuration.nix +++ b/machines/dragon/hardware-configuration.nix @@ -8,22 +8,25 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ]; - boot.initrd.kernelModules = [ "amdgpu" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "uas" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/65b2e400-b6f1-4158-9586-1f5bab13f664"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/1257f6f4-52bf-4c9a-aa00-86080ecd044c"; + fsType = "btrfs"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/685D-B6DB"; + { device = "/dev/disk/by-uuid/C182-445E"; fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/96a0423d-a4c0-4376-9d34-5a99b764010a"; } + ]; # 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 @@ -31,7 +34,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f0u1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;