fixed refreshrate on desktop

switch to neovim as a pager
added parrot and mining modules
deleted amd module
moved the rest of vfio configuration to vfio.nix
moved git from home-manager to system configuration

configuration.nix

@@ -1,27 +1,27 @@
 {
-  config,
   pkgs,
-  lib,
+  settings,
   ...
 }: {
-  system.stateVersion = "23.05";
+  system.stateVersion = settings.version;
   environment = {
     defaultPackages = []; #don't install anything by default
     binsh = "${pkgs.dash}/bin/dash"; #use dash for speed
     variables = {
       EDITOR = "vi";
       VISUAL = "vi";
+      PAGER = "page";
+      SYSTEMD_PAGERSECURE = "true";
       TERMINAL = "st";
     };
   };
-  #nix stuff
+  #hardware stuff
-  nix = {
+  hardware = {
-    settings = {
+    enableRedistributableFirmware = true;
-      auto-optimise-store = true; #save space
+    opengl = {
-      cores = 0; # use all cores
+      enable = true;
-      keep-outputs = false; #don't make ./results files
+      driSupport = true;
-      keep-derivations = false; #^
+      driSupport32Bit = true;
-      experimental-features = "nix-command flakes";
     };
   };
   #sound settings

flake.nix

@@ -25,25 +25,22 @@
     suckless,
     ...
   } @ inputs: let
+    settings = {
       username = "gerg";
+      version = "23.05";
+    };
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       inherit system;
-      config = {
+      config.allowUnfree = true;
-        allowUnfree = true;
-        packageOverrides = super: let
-          self = super.pkgs;
-        in {
-          nerdfonts-overpass = self.nerdfonts.override {
-            fonts = ["Overpass"];
-          };
-        };
-      };
       overlays = [
         (final: prev: rec {
           t-rex-miner = final.callPackage ./pkgs/t-rex-miner {};
           afk-cmds = final.callPackage ./pkgs/afk-cmds {};
           parrot = final.callPackage ./pkgs/parrot {};
+          nerdfonts-overpass = prev.nerdfonts.override {
+            fonts = ["Overpass"];
+          };
           discord = prev.discord.override {
             withOpenASAR = true;
             nss = prev.nss_latest;
@@ -59,7 +56,7 @@
     nixosConfigurations = {
       gerg-desktop = lib.nixosSystem {
         inherit system pkgs;
-        specialArgs = {inherit inputs username;};
+        specialArgs = {inherit inputs settings;};
         modules = [
           ./configuration.nix
           ./systems/desktop.nix
@@ -77,6 +74,11 @@
                 nixpkgs.flake = nixpkgs;
                 suckless.flake = suckless;
               };
+              settings = {
+                experimental-features = ["nix-command" "flakes"];
+                auto-optimise-store = true;
+                warn-dirty = false;
+              };
             };
           }
           home-manager.nixosModules.home-manager
@@ -84,9 +86,9 @@
             home-manager = {
               useGlobalPkgs = true;
               useUserPackages = false;
-              extraSpecialArgs = {inherit spicetify-nix username;};
+              extraSpecialArgs = {inherit spicetify-nix settings;};
               users = {
-                ${username} = import ./home-manager/home.nix;
+                ${settings.username} = import ./home-manager/home.nix;
                 root = import ./home-manager/root.nix;
               };
             };

home-manager/config/discord/settings.json

@@ -11,5 +11,6 @@
   "MIN_WIDTH": 0,
   "MIN_HEIGHT": 0,
   "OPEN_ON_STARTUP": false,
-  "MINIMIZE_TO_TRAY": false
+  "MINIMIZE_TO_TRAY": false,
+  "SKIP_HOST_UPDATE": true
 }

home-manager/git.nix

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  programs.git = {
-    enable = true;
-    package = pkgs.gitMinimal;
-    userName = "ISnortPennies";
-    userEmail = "ISnortPennies@protonmail.com";
-  };
-}

home-manager/home.nix

@@ -1,7 +1,6 @@
 {
-  config,
   pkgs,
-  username,
+  settings,
   ...
 }: {
   imports = [
@@ -9,14 +8,13 @@
     ./sxhkd.nix
     ./theme.nix
     ./picom.nix
-    ./git.nix
     ./spicetify.nix
     ./neovim
   ];
   xsession.numlock.enable = true;
   home = {
-    homeDirectory = "/home/${username}";
+    homeDirectory = "/home/${settings.username}";
-    stateVersion = "23.05";
+    stateVersion = settings.version;
     file = {
       ".background-image".source = ../images/nix-stars.png;
       ".config" = {

home-manager/librewolf.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs = {
     librewolf = {
       enable = true;

home-manager/neovim/config/init.lua

@@ -31,7 +31,7 @@ vim.g.indentLine_setConceal = 0
 vim.g.loaded = 1
 vim.g.loaded_netrwPlugin = 1
 require("nvim-tree").setup {
-  open_on_setup = true,
+  open_on_setup = false,
   sort_by = "case_sensitive",
   view = {
     adaptive_size = true,
@@ -63,7 +63,9 @@ vim.cmd[[colorscheme moonfly]]
 -- pretty colors
 require("colorizer").setup()
 require("telescope").load_extension("fzy_native")
-require("gitsigns").setup()
+require("gitsigns").setup {
+  current_line_blame = true,
+}
 require("nvim-autopairs").setup()
 
 -- telescope keybinds

home-manager/root.nix

@@ -1,17 +1,12 @@
-{
+{settings, ...}: {
-  config,
-  pkgs,
-  ...
-}: {
   imports = [
     ./theme.nix
-    ./git.nix
     ./neovim
   ];
   home = {
     username = "root";
     homeDirectory = "/root";
-    stateVersion = "23.05";
+    stateVersion = settings.version;
     file = {
       ".config/neofetch/config.conf" = {
         source = ./config/neofetch/config.conf;

home-manager/spicetify.nix

@@ -1,6 +1,5 @@
 {
   pkgs,
-  lib,
   spicetify-nix,
   ...
 }: let

home-manager/theme.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  home-manager,
-  ...
-}: {
   gtk = {
     enable = true;
     theme = {

modules/amd.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  boot.initrd.kernelModules = ["amdgpu"];
-  hardware.opengl = {
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-}

modules/boot.nix

@@ -1,5 +1,4 @@
 {
-  hardware.enableRedistributableFirmware = true;
   boot = {
     blacklistedKernelModules = ["nouveau" "lbm-nouveau" "pcspkr"];
     kernelParams = ["fbcon=nodefer" "bgrt_disable" "quiet" "splash"];

modules/git.nix

@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  programs.git = {
+    enable = true;
+    package = pkgs.gitMinimal;
+    config = {
+      user = {
+        name = "ISnortPennies";
+        email = "ISnortPennies@protonmail.com";
+      };
+      init = {
+        defaultBranch = "master";
+      };
+    };
+  };
+}

modules/mining.nix

@@ -0,0 +1,27 @@
+{
+  pkgs,
+  settings,
+  ...
+}: {
+  boot = {
+    kernelModules = ["msr"];
+    kernelParams = ["iomem=relaxed" "msr.allow_writes=on"];
+  };
+  systemd.services.mining = {
+    enable = true;
+    path = with pkgs; [t-rex-miner afk-cmds st zsh dbus xmrig];
+    wantedBy = ["multi-user.target"];
+    wants = ["graphical.target"];
+    script = ''
+      afk-cmds -c /home/${settings.username}/afk-cmds.json
+    '';
+    environment = {
+      #  PATH="/run/current-system/sw/bin"; missing something with dbus
+      XAUTHORITY = "/home/${settings.username}/.Xauthority";
+      DISPLAY = ":0";
+      XDG_DATA_DIRS = "/nix/var/nix/profiles/default/share:/run/current-system/sw/share";
+      DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus";
+      NO_AT_BRIDGE = "1";
+    };
+  };
+}

modules/nvidia.nix

@@ -1,14 +0,0 @@
-{config, ...}: {
-  hardware = {
-    nvidia = {
-      nvidiaPersistenced = false;
-      nvidiaSettings = false;
-      modesetting.enable = true;
-    };
-    opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-    };
-  };
-}

modules/packages.nix

@@ -1,7 +1,6 @@
 {
   config,
   pkgs,
-  inputs,
   ...
 }: {
   environment.systemPackages = with pkgs; [
@@ -13,7 +12,6 @@
     btrfs-progs #for external harddrive
     vlc #play stuff
     bitwarden #store stuff
-    gimp #edit stuff
     qbittorrent #steal stuff
     discord # talk to people (gross)
     feh #for wallpaper
@@ -32,5 +30,6 @@
     pcmanfm #file manager
     nix-tree #view packages
     bc #terminal calculator
+    page #use nvim as a pager
   ];
 }

modules/parrot.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  settings,
+  ...
+}: {
+  #discord bot stuff
+  virtualisation.docker.enable = false;
+  systemd.services.parrot = {
+    enable = true;
+    path = with pkgs; [parrot yt-dlp ffmpeg];
+    wantedBy = ["multi-user.target"];
+    wants = ["NetworkManager-wait-online.service"];
+    after = ["NetworkManager-wait-online.service"];
+    script = "parrot";
+    serviceConfig = {
+      EnvironmentFile = "/home/${settings.username}/parrot/.env";
+    };
+  };
+}

modules/prime.nix

@@ -1,7 +1,15 @@
-{config, ...}: {
+{
   hardware.nvidia.prime = {
     sync.enable = true;
     amdgpuBusId = "PCI:5:0:0";
     nvidiaBusId = "PCI:1:0:0";
+    nvidia = {
+      nvidiaPersistenced = false;
+      nvidiaSettings = false;
+      modesetting.enable = true;
+    };
+  };
+  services.xserver = {
+    videoDrivers = ["modesetting" "nvidia"];
   };
 }

modules/refreshrate.nix

@@ -1,26 +1,26 @@
 {
   services.xserver = {
-    xrandrHeads = [
+    #set drivers for igpu
-      {
+    videoDrivers = ["amdgpu"];
-        output = "HDMI-0";
+    #fix nasty screen tearing
-        primary = true;
-        monitorConfig = ''
-          Option "DPMS" "false"
-        '';
-      }
-    ];
     screenSection = ''
-      Option         "metamodes" "1920x1080_144 +0+0"
+      Option "TearFree" "true"
     '';
+    #set monitor as primary
+    #set refreshrate to 144 instead of default(60)
+    #disable DPMS(screen turning off)
     monitorSection = ''
+      Option      "Primary" "true"
+      Modeline "1920x1080_144" 332.75 1920 1952 2016 2080 1080 1084 1089 1111 +HSync +VSync
+      Option "PreferredMode" "1920x1080_144"
       Option "DPMS" "false"
     '';
+    #disable screen blanking in total
     serverFlagsSection = ''
-      Option "BlankTime" "0"
       Option "StandbyTime" "0"
       Option "SuspendTime" "0"
       Option "OffTime" "0"
-      Option "DPMS" "false"
+      Option "BlankTime" "0"
     '';
   };
 }

modules/scripts.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  config,
-  ...
-}: let
   update-system = pkgs.writeShellScriptBin "update-system" ''
     if ! [ $(id -u) = 0 ]; then
       echo "RUN AS ROOT"

modules/smb.nix

@@ -1,4 +1,4 @@
-{username, ...}: {
+{settings, ...}: {
   services.samba-wsdd.enable = true; # make shares visible for windows 10 clients
   networking.firewall = {
     allowedTCPPorts = [139 445];
@@ -10,11 +10,11 @@
     openFirewall = true;
     shares = {
       Share = {
-        path = "/home/${username}/Share";
+        path = "/home/${settings.username}/Share";
         browseable = "no";
         "read only" = "no";
         "guest ok" = "no";
-        "force user" = "${username}";
+        "force user" = "${settings.username}";
         "force group" = "users";
       };
     };

modules/vfio.nix

@@ -1,11 +1,11 @@
 {
   pkgs,
-  username,
+  settings,
   ...
 }: {
   boot = {
     kernelParams = ["amd_iommu=on" "iommu=pt" "vfio_iommu_type1.allow_unsafe_interrupts=1" "kvm.ignore_msrs=1"];
-    kernelModules = ["vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio"];
+    kernelModules = ["amd-kvm" "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio"];
     initrd.kernelModules = ["vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio"];
     extraModprobeConfig = ''
       options vfio-pci ids=10de:228e,10de:2504
@@ -18,7 +18,7 @@
         runAsRoot = true;
         ovmf.enable = true;
         verbatimConfig = ''
-          user = "${username}"
+          user = "${settings.username}"
           group = "kvm"
           namespaces = []
         '';

modules/xserver.nix

@@ -1,16 +1,11 @@
 {
-  config,
   pkgs,
-  username,
+  settings,
-  inputs,
   ...
 }: {
   services.xserver = {
     enable = true;
-    videoDrivers =
+    exportConfiguration = true; #make config debuggable
-      if (config.networking.hostName == "gerg-laptop")
-      then ["modesetting" "nvidia"]
-      else ["amdgpu"];
     layout = "us";
     libinput.enable = true;
     xautolock.enable = false;
@@ -25,7 +20,7 @@
           enable = true;
           extraConfig = ''
             [greeter]
-            user = ${username}
+            user = ${settings.username}
             show-password-label = false
             password-label-text =
             invalid-password-text =
@@ -62,7 +57,6 @@
             password-border-color = "#000000"
             password-border-width = 2px
             password-border-radius = 0.341125em
-
           '';
         };
       };

systems/desktop.nix

@@ -1,14 +1,10 @@
 {
-  config,
   pkgs,
-  callPackage,
+  settings,
-  lib,
-  username,
   ...
 }: {
   #important stuff first
   imports = [
-    ../modules/amd.nix
     ../modules/packages.nix
     ../modules/boot.nix
     ../modules/fonts.nix
@@ -18,29 +14,31 @@
     ../modules/xserver.nix
     ../modules/smb.nix
     ../modules/zsh.nix
+    ../modules/git.nix
+    #../modules/mining.nix
+    ../modules/parrot.nix
   ];
   networking.hostName = "gerg-desktop";
   boot.kernelPackages = pkgs.linuxPackages_latest;
   hardware.cpu.amd.updateMicrocode = true;
   #end important stuff
   environment.systemPackages = with pkgs; [
-    #afk-cmds
-    xmrig
-    t-rex-miner
     vscodium
+    gimp
   ];
   #user managment
   users = {
     defaultUserShell = pkgs.zsh;
-    users."${username}" = {
+    users."${settings.username}" = {
       isNormalUser = true;
       extraGroups = ["wheel" "audio" "networkmanager" "kvm" "libvirtd"];
     };
   };
   boot = {
-    initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "uas" "sd_mod"];
+    initrd = {
-    kernelModules = ["kvm-amd" "msr"];
+      kernelModules = ["amdgpu"];
-    kernelParams = ["iomem=relaxed" "msr.allow_writes=on"];
+      availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "uas" "sd_mod"];
+    };
   };
 
   fileSystems = {
@@ -53,34 +51,4 @@
       fsType = "vfat";
     };
   };
-  #discord bot stuff
-  virtualisation.docker.enable = false;
-  systemd.services.parrot = {
-    enable = true;
-    path = with pkgs; [parrot yt-dlp ffmpeg];
-    wantedBy = ["multi-user.target"];
-    wants = ["NetworkManager-wait-online.service"];
-    after = ["NetworkManager-wait-online.service"];
-    script = "parrot";
-    serviceConfig = {
-      EnvironmentFile = "/home/${username}/parrot/.env";
-    };
-  };
-  #mining stuff
-  systemd.services.mining = {
-    enable = false;
-    path = with pkgs; [t-rex-miner afk-cmds st zsh dbus xmrig];
-    wants = ["graphical.target"];
-    script = ''
-      afk-cmds -c /home/${username}/afk-cmds.json
-    '';
-    environment = {
-      #  PATH="/run/current-system/sw/bin"; missing something with dbus
-      XAUTHORITY = "/home/${username}/.Xauthority";
-      DISPLAY = ":0";
-      XDG_DATA_DIRS = "/nix/var/nix/profiles/default/share:/run/current-system/sw/share";
-      DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/user/1000/bus";
-      NO_AT_BRIDGE = "1";
-    };
-  };
 }

systems/laptop.nix

@@ -1,18 +1,15 @@
 {
-  config,
   pkgs,
-  callPackage,
+  settings,
-  lib,
-  username,
   ...
 }: {
   #important stuff first
   imports = [
     ../modules/boot.nix
-    ../modules/prime.nix
-    ../modules/nvidia.nix
-    ../modules/packages.nix
     ../modules/fonts.nix
+    ../modules/git.nix
+    ../modules/packages.nix
+    ../modules/prime.nix
     ../modules/scripts.nix
     ../modules/xserver.nix
     ../modules/zsh.nix
@@ -22,13 +19,14 @@
   hardware.cpu.amd.updateMicrocode = true;
 
   # end important stuff
-  environment.systemPackages = with pkgs; [
+  #environment.systemPackages = with pkgs; [
-    xorg.xf86videoamdgpu
+  #  xorg.xf86videoamdgpu
-  ];
+  #];
+  #don't think i need this^
   # user managment
   users = {
     defaultUserShell = pkgs.zsh;
-    users."${username}" = {
+    users."${settings.username}" = {
       isNormalUser = true;
       extraGroups = ["wheel" "audio" "networkmanager"];
     };