diff --git a/config/home.nix b/config/home.nix index c6e9134..692da5b 100644 --- a/config/home.nix +++ b/config/home.nix @@ -23,6 +23,7 @@ ../shared/ssh.nix ../shared/aerc.nix ../shared/oh-my-posh.nix + ../shared/gtk.nix ]; nixpkgs = { diff --git a/config/programs.nix b/config/programs.nix index 9dbc888..b373429 100644 --- a/config/programs.nix +++ b/config/programs.nix @@ -35,6 +35,7 @@ drawio freecad-wayland ghostty + kdePackages.okular # Browsers librewolf diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix index 25329e5..3f9036c 100644 --- a/maskiner/jobb/configuration.nix +++ b/maskiner/jobb/configuration.nix @@ -99,7 +99,7 @@ fonts.packages = with pkgs; [ services = { - tailscale.enable = true; + #tailscale.enable = true; picom.enable = true; openssh = { enable = true; @@ -143,7 +143,7 @@ services = { # Allow unfree packages nixpkgs.config.allowUnfree = true; - services.xserver.dpi = 180; + services.xserver.dpi = 140; system.stateVersion = "25.05"; # Did you read the comment? } diff --git a/maskiner/jobb/hardware-configuration.nix b/maskiner/jobb/hardware-configuration.nix index 951f13c..eab8768 100644 --- a/maskiner/jobb/hardware-configuration.nix +++ b/maskiner/jobb/hardware-configuration.nix @@ -8,24 +8,24 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/40bb9f8c-1a35-476a-8d78-18763ec97171"; + { device = "/dev/disk/by-uuid/751f2210-9f0a-46da-bc62-25ede9a5f8a7"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/FAC4-0F98"; + { device = "/dev/disk/by-uuid/1947-AC4C"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/d14d1b31-04fb-4ec8-a70f-438939898c3f"; } + [ { device = "/dev/disk/by-uuid/0eea714d-1c2f-4981-b25b-920205959594"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -33,10 +33,10 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.enp59s0u1u4.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp195s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp196s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp194s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/maskiner/jobb/hardware-configuration.nix.bak b/maskiner/jobb/hardware-configuration.nix.bak new file mode 100644 index 0000000..951f13c --- /dev/null +++ b/maskiner/jobb/hardware-configuration.nix.bak @@ -0,0 +1,42 @@ +# 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 = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/40bb9f8c-1a35-476a-8d78-18763ec97171"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/FAC4-0F98"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/d14d1b31-04fb-4ec8-a70f-438939898c3f"; } + ]; + + # 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 + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.enp59s0u1u4.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/shared/gtk.nix b/shared/gtk.nix new file mode 100644 index 0000000..95dc686 --- /dev/null +++ b/shared/gtk.nix @@ -0,0 +1,9 @@ +{ pkgs, ...}: +{ + gtk = { + enable = true; + cursorTheme = { + name = "Bibata Modern Ice"; + }; + }; +}