From 20a3384db612f27911052995276573acaaea4c19 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 13 Jun 2023 00:30:12 +0200 Subject: flake-x: replaced by real x --- 1systems/flake-x/config.nix | 255 --------------------------------- 1systems/flake-x/result | 1 - 1systems/flake-x/source.nix | 12 -- 1systems/flake-x/x13/battery.nix | 6 - 1systems/flake-x/x13/default.nix | 47 ------ 1systems/flake-x/x13/disk.nix | 70 --------- 1systems/flake-x/x13/input.nix | 48 ------- 1systems/flake-x/x13/toggle_brightness | 8 -- 1systems/flake-x/x13/zfs.nix | 34 ----- 1systems/flake-x/x230/default.nix | 19 --- 1systems/x/config.nix | 179 +++++++++++------------ 1systems/x/x13/default.nix | 21 +-- 1systems/x/x13/disk.nix | 5 +- 13 files changed, 99 insertions(+), 606 deletions(-) delete mode 100644 1systems/flake-x/config.nix delete mode 120000 1systems/flake-x/result delete mode 100644 1systems/flake-x/source.nix delete mode 100644 1systems/flake-x/x13/battery.nix delete mode 100644 1systems/flake-x/x13/default.nix delete mode 100644 1systems/flake-x/x13/disk.nix delete mode 100644 1systems/flake-x/x13/input.nix delete mode 100644 1systems/flake-x/x13/toggle_brightness delete mode 100644 1systems/flake-x/x13/zfs.nix delete mode 100644 1systems/flake-x/x230/default.nix diff --git a/1systems/flake-x/config.nix b/1systems/flake-x/config.nix deleted file mode 100644 index f8059cc2b..000000000 --- a/1systems/flake-x/config.nix +++ /dev/null @@ -1,255 +0,0 @@ -{ config, pkgs, lib, self, ... }: -{ - imports = - [ - - # ./x230 - ./x13 - - (self + "/2configs/default.nix") - - ## Common Hardware Components - ## - ## - # - ## - ## - ## - # - ## - # - # - # - # - ## - - ## base - # - # - # - # - # - # - # - - # - # - # - # - # - #{ programs.adb.enable = true; } - #{ - # services.openssh.hostKeys = [ - # { bits = 4096; path = (toString ); type = "rsa";} - # ]; - #} - ##{ - ## imports = [ - ## - ## ]; - ## services.pipewire.config.pipewire-pulse = { - ## "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ]; - ## }; - ## networking.firewall.allowedTCPPorts = [ 4713 ]; - - ##} - - ##{ - ## users.users.makefu.packages = with pkgs;[ mpc_cli ncmpcpp ]; - ## services.ympd.enable = true; - ## services.mpd = { - ## enable = true; - ## extraConfig = '' - ## log_level "default" - ## auto_update "yes" - - ## audio_output { - ## type "httpd" - ## name "lassulus radio" - ## encoder "vorbis" # optional - ## port "8000" - ## quality "5.0" # do not define if bitrate is defined - ## # bitrate "128" # do not define if quality is defined - ## format "44100:16:2" - ## always_on "yes" # prevent MPD from disconnecting all listeners when playback is stopped. - ## tags "yes" # httpd supports sending tags to listening streams. - ## } - ## ''; - ## }; - ##} - - ## { systemd.services.docker.wantedBy = lib.mkForce []; } - ## - ## - ## - ##{ - ## netboot_server = { - ## network.wan = "wlp3s0"; - ## network.lan = "enp0s25"; - ## }; - ##} - - ## Restore: - ## systemctl cat borgbackup-job-state - ## export BORG_PASSCOMMAND BORG_REPO BORG_RSH - ## borg list "$BORG_REPO" - ## mount newroot somewhere && cd somewhere - ## borg extract "$BORG_REPO::x-state-2019-04-17T01:41:51" --progress # < extract to cwd - # - - ## - # - # - - ## Debugging - ## - ## - - ## Testing - ##{ - ## services.nginx = { - ## enable = true; - ## recommendedProxySettings = true; - ## virtualHosts.local = { - ## default = true; - ## locations."/".proxyPass= "http://localhost:4567"; - ## }; - ## }; - ## services.gollum = { - ## enable = true; - ## extraConfig = '' - ## Gollum::Hook.register(:post_commit, :hook_id) do |committer, sha1| - ## File.open('/tmp/lol', 'w') { |file| file.write(self.to_s) } - ## end - ## ''; - ## }; - ##} - ## - ## - ## - - ## - ## - ## - ## - ## - ## - ## - ## - - ## Krebs - # - ## - ## - # - # - ## - - - ## applications - # - # - # - ## - ## - - ## Virtualization - ## - # - # - ##{ - ## networking.firewall.allowedTCPPorts = [ 8080 ]; - ## networking.nat = { - ## enable = true; - ## externalInterface = "wlp3s0"; - ## internalInterfaces = [ "vboxnet0" ]; - ## }; - ##} - ## Services - # - # - ## - ## - # - ## - ## { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; } - - ## - # - - - - ## Security - ## - - ## temporary - ## { services.redis.enable = true; } - ## citadel exporter - ## { services.mongodb.enable = true; } - ## { services.elasticsearch.enable = true; } - ## - ## - ## - ## - ## - ## - ## - ## - # - -# { -# networking.wireguard.interfaces.wg0 = { -# ips = [ "10.244.0.2/24" ]; -# privateKeyFile = (toString ) + "/wireguard.key"; -# allowedIPsAsRoutes = true; -# peers = [ -# { -# # gum -# endpoint = "${config.krebs.hosts.gum.nets.internet.ip4.addr}:51820"; -# allowedIPs = [ "10.244.0.0/24" ]; -# publicKey = "yAKvxTvcEVdn+MeKsmptZkR3XSEue+wSyLxwcjBYxxo="; -# } -# #{ -# # # vbob -# # allowedIPs = [ "10.244.0.3/32" ]; -# # publicKey = "Lju7EsCu1OWXhkhdNR7c/uiN60nr0TUPHQ+s8ULPQTw="; -# #} -# ]; -# }; -# } - ]; - - - nixpkgs.config.allowUnfree = true; - nixpkgs.config.oraclejdk.accept_license = true; - - # configure pulseAudio to provide a HDMI sink as well - networking.firewall.enable = true; - networking.firewall.allowedUDPPorts = [ 665 26061 1514 ]; - networking.firewall.trustedInterfaces = [ "vboxnet0" "enp0s25" ]; - - krebs.build.host = config.krebs.hosts.x; - - #krebs.tinc.retiolum.connectTo = lib.mkForce [ "gum" ]; - #krebs.tinc.retiolum.extraConfig = "AutoConnect = no"; - - # environment.variables = { GOROOT = [ "${pkgs.go.out}/share/go" ]; }; - state = [ - "/home/makefu/stockholm" - "/home/makefu/.ssh/" - "/home/makefu/.zsh_history" - "/home/makefu/.bash_history" - "/home/makefu/bin" - "/home/makefu/.gnupg" - "/home/makefu/.imapfilter" - "/home/makefu/.mutt" - "/home/makefu/docs" - "/home/makefu/notes" - "/home/makefu/.password-store" - "/home/makefu/.secrets-pass" - "/home/makefu/.config/syncthing" - ]; - - # services.syncthing.user = lib.mkForce "makefu"; - # services.syncthing.dataDir = lib.mkForce "/home/makefu/.config/syncthing/"; -} diff --git a/1systems/flake-x/result b/1systems/flake-x/result deleted file mode 120000 index f1d172d8c..000000000 --- a/1systems/flake-x/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/svjw1v86maxhw6l7wy6s1p7rsxm7582i-nixos-vm \ No newline at end of file diff --git a/1systems/flake-x/source.nix b/1systems/flake-x/source.nix deleted file mode 100644 index ecb1d9962..000000000 --- a/1systems/flake-x/source.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - name="x"; - full = true; - python = true; - hw = true; - # unstable = true; - mic92 = true; - clever_kexec = true; - home-manager = true; - nix-ld = true; - # torrent = true; -} diff --git a/1systems/flake-x/x13/battery.nix b/1systems/flake-x/x13/battery.nix deleted file mode 100644 index 3e28292e3..000000000 --- a/1systems/flake-x/x13/battery.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: -{ - powerManagement.powertop.enable = true; - services.power-profiles-daemon.enable = true; - users.users.makefu.packages = [ pkgs.gnome.gnome-power-manager ]; -} diff --git a/1systems/flake-x/x13/default.nix b/1systems/flake-x/x13/default.nix deleted file mode 100644 index 32d15df1a..000000000 --- a/1systems/flake-x/x13/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ pkgs, lib, nixos-hardware, self, ... }: -# new zfs deployment -{ - imports = [ - ./input.nix - ./disk.nix - ./battery.nix - - (self + "/2configs/hw/bluetooth.nix") - (self + "/2configs/hw/tpm.nix") - (self + "/2configs/hw/ssd.nix") - # (self + "/2configs/hw/xmm7360.nix") - - nixos-hardware.nixosModules.lenovo-thinkpad-l14-amd - - ]; - boot.zfs.requestEncryptionCredentials = true; - networking.hostId = "f8b8e0a2"; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # services.xserver.enable = lib.mkForce false; - - services.xserver.videoDrivers = [ "amdgpu" ]; - boot.initrd.kernelModules = [ "amdgpu" ]; - hardware.opengl.driSupport = true; - hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ]; - # For 32 bit applications - hardware.opengl.driSupport32Bit = true; - hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; - # is required for amd graphics support ( xorg wont boot otherwise ) - #boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelPackages = lib.mkForce pkgs.linuxPackages; - - services.fwupd.enable = true; - - programs.light.enable = true; - - users.groups.video = {}; - users.groups.render = {}; - users.users.makefu.extraGroups = [ "video" "render" ]; - - boot.extraModprobeConfig = '' - options thinkpad_acpi fan_control=1 - ''; -} - diff --git a/1systems/flake-x/x13/disk.nix b/1systems/flake-x/x13/disk.nix deleted file mode 100644 index 3fae8d410..000000000 --- a/1systems/flake-x/x13/disk.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ ... }: -let - disk = "/dev/nvme0n1"; -in { - disko.devices = { - disk = { - nvme = { - type = "disk"; - device = disk; - content = { - type = "table"; - format = "gpt"; - partitions = [ - { - name = "ESP"; - start = "0"; - end = "512MiB"; - fs-type = "fat32"; - bootable = true; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - } - { - name = "zfs"; - start = "512MiB"; - end = "100%"; - content = { - type = "zfs"; - pool = "tank"; - }; - } - ]; - }; - }; - }; - zpool = { - tank = { - type = "zpool"; - rootFsOptions = { - compression = "lz4"; - #reservation = "5G"; - "com.sun:auto-snapshot" = "false"; - }; - mountpoint = null; - postCreateHook = "zfs snapshot tank@blank"; - - datasets = { - - root = { - type = "zfs_fs"; - mountpoint = "/"; - options = { - encryption = "aes-256-gcm"; - keyformat = "passphrase"; - "com.sun:auto-snapshot" = "true"; - }; - #keylocation = "file:///tmp/secret.key"; - }; - "root/home" = { - type = "zfs_fs"; - mountpoint = "/home"; - }; - }; - }; - }; - }; -} diff --git a/1systems/flake-x/x13/input.nix b/1systems/flake-x/x13/input.nix deleted file mode 100644 index 93816ce84..000000000 --- a/1systems/flake-x/x13/input.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, lib, ... }: -{ - # current issues: - # 1. for pressing insert hold shift+fn+Fin - - # scroll by holding middle mouse - #services.xserver.displayManager.sessionCommands ='' - # xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation" 8 1 - # xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Button" 8 2 - # xinput set-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5 - # # configure timeout of pressing and holding middle button - # # xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Timeout" 8 200 - # xinput disable 'ETPS/2 Elantech Touchpad' - #''; - - services.xserver.libinput.enable = true; - boot.kernelParams = [ - #"psmouse.proto=imps" - #"psmouse.proto=bare" - #"psmouse.resetafter=0" - "psmouse.synaptics_intertouch=1" # echo 1 > /sys/devices/platform/i8042/serio1/reg_07 - ]; - - programs.light.enable = true; - services.actkbd = { - enable = true; - bindings = [ - { keys = [ 225 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -A 10"; } # fn - F5 - { keys = [ 224 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -U 10"; } # fn - F6 - # fn - 4 => suspend - # fn - d => lcdshadow - #{ keys = [ 227 ]; events = [ "key" ]; command = builtins.toString ( # fn - F7 - # pkgs.writers.writeDash "toggle_touchpad" '' - # PATH=${lib.makeBinPath [ pkgs.xorg.xinput pkgs.gnugrep ]} - # DISPLAY=:0 - # export DISPLAY PATH - - # device=$(xinput list --name-only | grep Touchpad) - # if [ "$(xinput list-props "$device" | grep -P ".*Device Enabled.*\K.(?=$)" -o)" -eq 1 ];then - # xinput disable "$device" - # else - # xinput enable "$device" - # fi - # ''); - #} - ]; - }; -} diff --git a/1systems/flake-x/x13/toggle_brightness b/1systems/flake-x/x13/toggle_brightness deleted file mode 100644 index dc1436cb6..000000000 --- a/1systems/flake-x/x13/toggle_brightness +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -proc=/proc/acpi/ibm/lcdshadow -status=$(awk '/status:/{print $2}' "$proc") -if [ "$status" -eq 0 ];then - echo 1 > "$proc" -else - echo 0 > "$proc" -fi diff --git a/1systems/flake-x/x13/zfs.nix b/1systems/flake-x/x13/zfs.nix deleted file mode 100644 index ba341ef50..000000000 --- a/1systems/flake-x/x13/zfs.nix +++ /dev/null @@ -1,34 +0,0 @@ -# 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 = [ "nvme" "ehci_pci" "xhci_pci" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - boot.zfs.enableUnstable = true; # required for 21.05 - fileSystems."/" = - { device = "zroot/root/nixos"; - fsType = "zfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/20BF-2755"; - fsType = "vfat"; - }; - - fileSystems."/home" = - { device = "zroot/root/home"; - fsType = "zfs"; - }; - - swapDevices = [ ]; - services.zfs.autoScrub.enable = true; -} diff --git a/1systems/flake-x/x230/default.nix b/1systems/flake-x/x230/default.nix deleted file mode 100644 index c2a635ca7..000000000 --- a/1systems/flake-x/x230/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - imports = [ - # + bluetooth - - - - - - # hard dependency because otherwise the device will not be unlocked - { - boot.initrd.luks.devices.luksroot = - { - device = "/dev/sda2"; - allowDiscards = true; - }; - } - { makefu.server.primary-itf = "wlp3s0"; } - ]; -} diff --git a/1systems/x/config.nix b/1systems/x/config.nix index 784f9148f..be2f12402 100644 --- a/1systems/x/config.nix +++ b/1systems/x/config.nix @@ -1,47 +1,41 @@ -# -# -# -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, self, ... }: { imports = [ - # hardware-dependent - # device - - ./x13 # ./x230 + ./x13 - # Common Hardware Components - - # - # - - # - # - # - - # - - - - - # + (self + "/2configs/default.nix") + + ## Common Hardware Components + # (self + "/makefu/2configs/hw/mceusb.nix") + # (self + "/2configs/hw/rtl8812au.nix") + (self + "/2configs/hw/network-manager.nix") + # (self + "/2configs/hw/stk1160.nix") + # (self + "/2configs/hw/irtoy.nix") + # (self + "/2configs/hw/malduino_elite.nix") + (self + "/2configs/hw/switch.nix") + # (self + "/2configs/hw/rad1o.nix") + (self + "/2configs/hw/cc2531.nix") + (self + "/2configs/hw/droidcam.nix") + (self + "/2configs/hw/smartcard.nix") + (self + "/2configs/hw/upower.nix") + #(self + "/2configs/hw/ps4-compat.nix") # base - - - - - - - - - - - - - + (self + "/2configs/nur.nix") + (self + "/2configs/home-manager") + (self + "/2configs/home-manager/desktop.nix") + (self + "/2configs/home-manager/cli.nix") + (self + "/2configs/home-manager/mail.nix") + (self + "/2configs/home-manager/taskwarrior.nix") + + (self + "/2configs/main-laptop.nix") + (self + "/2configs/kdeconnect.nix") + (self + "/2configs/extra-fonts.nix") + (self + "/2configs/editor/neovim") + (self + "/2configs/tools/all.nix") { programs.adb.enable = true; } { services.openssh.hostKeys = [ @@ -50,7 +44,7 @@ } #{ # imports = [ - # + # (self + "/2configs/bureautomation/rhasspy.nix") # ]; # services.pipewire.config.pipewire-pulse = { # "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ]; @@ -84,9 +78,9 @@ #} # { systemd.services.docker.wantedBy = lib.mkForce []; } - # - # - # + # (self + "/2configs/dict.nix") + # (self + "/2configs/legacy_only.nix") + #(self + "/3modules/netboot_server.nix") #{ # netboot_server = { # network.wan = "wlp3s0"; @@ -100,15 +94,15 @@ # borg list "$BORG_REPO" # mount newroot somewhere && cd somewhere # borg extract "$BORG_REPO::x-state-2019-04-17T01:41:51" --progress # < extract to cwd - + (self + "/2configs/backup/state.nix") - # - - + # (self + "/2configs/dnscrypt/client.nix") + (self + "/2configs/avahi.nix") + (self + "/2configs/support-nixos.nix") # Debugging - # - # + # (self + "/2configs/disable_v6.nix") + # (self + "/2configs/pyload.nix") # Testing #{ @@ -129,39 +123,39 @@ # ''; # }; #} - # - # - # - - # - # - # - # - # - # - # - # + # (self + "/2configs/deployment/gitlab.nix") + # (self + "/2configs/deployment/docker/etherpad.nix") + # (self + "/2configs/deployment/wiki-irc-bot") + + # (self + "/2configs/torrent.nix") + # (self + "/2configs/deployment/dirctator.nix") + # (self + "/2configs/vncserver.nix") + # (self + "/2configs/deployment/led-fader") + # (self + "/2configs/deployment/hound") + # (self + "/2configs/deployment/photostore.krebsco.de.nix") + # (self + "/2configs/deployment/bureautomation/hass.nix") + # (self + "/2configs/bureautomation/office-radio") # Krebs - - # - # - - - # + (self + "/2configs/tinc/retiolum.nix") + # (self + "/2configs/share/anon-ftp.nix") + # (self + "/2configs/share/anon-sftp.nix") + (self + "/2configs/share/gum-client.nix") + (self + "/2configs/share") + # (self + "/2configs/share/temp-share-samba.nix") # applications - - - - # - # + # (self + "/2configs/exim-retiolum.nix") + (self + "/2configs/mail-client.nix") + (self + "/2configs/printer.nix") + # (self + "/2configs/syncthing.nix") + # (self + "/2configs/sync") # Virtualization - # - - + # (self + "/2configs/virtualisation/libvirt.nix") + (self + "/2configs/virtualisation/docker.nix") + (self + "/2configs/virtualisation/virtualbox.nix") #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; # networking.nat = { @@ -171,36 +165,36 @@ # }; #} # Services - - - # - # - - # + (self + "/2configs/git/brain-retiolum.nix") + (self + "/2configs/tor.nix") + # (self + "/2configs/vpn/vpngate.nix") + # (self + "/2configs/buildbot-standalone.nix") + (self + "/2configs/remote-build/aarch64-community.nix") + # (self + "/2configs/remote-build/gum.nix") # { nixpkgs.overlays = [ (self: super: super.prefer-remote-fetch self super) ]; } - # - + # (self + "/2configs/binary-cache/gum.nix") + (self + "/2configs/binary-cache/lass.nix") # Security - # + # (self + "/2configs/sshd-totp.nix") # temporary # { services.redis.enable = true; } # citadel exporter # { services.mongodb.enable = true; } # { services.elasticsearch.enable = true; } - # - # - # - # - # - # - # - # - + # (self + "/2configs/deployment/nixos.wiki") + # (self + "/2configs/home/photoprism.nix") + # (self + "/2configs/dcpp/airdcpp.nix") + # (self + "/2configs/nginx/rompr.nix") + # (self + "/2configs/lanparty/lancache.nix") + # (self + "/2configs/lanparty/lancache-dns.nix") + # (self + "/2configs/lanparty/samba.nix") + # (self + "/2configs/lanparty/mumble-server.nix") + (self + "/2configs/wireguard/wiregrill.nix") # { # networking.wireguard.interfaces.wg0 = { @@ -228,8 +222,6 @@ nixpkgs.config.allowUnfree = true; nixpkgs.config.oraclejdk.accept_license = true; - - # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; networking.firewall.allowedUDPPorts = [ 665 26061 1514 ]; @@ -240,9 +232,6 @@ #krebs.tinc.retiolum.connectTo = lib.mkForce [ "gum" ]; #krebs.tinc.retiolum.extraConfig = "AutoConnect = no"; - - environment.systemPackages = [ pkgs.passwdqc-utils ]; - # environment.variables = { GOROOT = [ "${pkgs.go.out}/share/go" ]; }; state = [ "/home/makefu/stockholm" diff --git a/1systems/x/x13/default.nix b/1systems/x/x13/default.nix index 27ea0c99c..32d15df1a 100644 --- a/1systems/x/x13/default.nix +++ b/1systems/x/x13/default.nix @@ -1,15 +1,18 @@ -{ pkgs, lib, ... }: +{ pkgs, lib, nixos-hardware, self, ... }: # new zfs deployment { imports = [ - ./zfs.nix ./input.nix + ./disk.nix ./battery.nix - - # close enough - # - - # + + (self + "/2configs/hw/bluetooth.nix") + (self + "/2configs/hw/tpm.nix") + (self + "/2configs/hw/ssd.nix") + # (self + "/2configs/hw/xmm7360.nix") + + nixos-hardware.nixosModules.lenovo-thinkpad-l14-amd + ]; boot.zfs.requestEncryptionCredentials = true; networking.hostId = "f8b8e0a2"; @@ -24,9 +27,7 @@ hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd pkgs.rocm-opencl-runtime ]; # For 32 bit applications hardware.opengl.driSupport32Bit = true; - hardware.opengl.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; # is required for amd graphics support ( xorg wont boot otherwise ) #boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = lib.mkForce pkgs.linuxPackages; diff --git a/1systems/x/x13/disk.nix b/1systems/x/x13/disk.nix index 7ce77bdf5..3fae8d410 100644 --- a/1systems/x/x13/disk.nix +++ b/1systems/x/x13/disk.nix @@ -1,4 +1,7 @@ -{ disk ? "/dev/sda", ... }: { +{ ... }: +let + disk = "/dev/nvme0n1"; +in { disko.devices = { disk = { nvme = { -- cgit v1.2.3