From 277432379c55dbe9020989712c311f775458eb12 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 15 Mar 2024 00:24:38 +0000 Subject: [PATCH] [NixOS] Add strixy-minaj --- dotfiles/config/htop/htoprc | 14 ++++---- nixos/flake.lock | 32 ++++++++--------- nixos/home-manager.nix | 1 - nixos/machines/strixy-minaj.nix | 64 +++++++++++++++++++++++++++++++++ nixos/users.nix | 5 +++ 5 files changed, 92 insertions(+), 24 deletions(-) create mode 100644 nixos/machines/strixy-minaj.nix diff --git a/dotfiles/config/htop/htoprc b/dotfiles/config/htop/htoprc index b1204acc..35fbd3a3 100644 --- a/dotfiles/config/htop/htoprc +++ b/dotfiles/config/htop/htoprc @@ -1,6 +1,6 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -htop_version=3.2.2 +htop_version=3.3.0 config_reader_min_version=3 fields=0 48 17 18 38 39 40 2 46 47 49 1 hide_kernel_threads=1 @@ -39,25 +39,25 @@ column_meter_modes_0=1 1 1 column_meters_1=Tasks LoadAverage Uptime column_meter_modes_1=2 2 2 tree_view=0 -sort_key=46 +sort_key=48 tree_sort_key=46 -sort_direction=-1 +sort_direction=1 tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_CPU +.sort_key=USER .tree_sort_key=PERCENT_CPU -.tree_view=0 .tree_view_always_by_pid=0 -.sort_direction=-1 +.tree_view=0 +.sort_direction=1 .tree_sort_direction=-1 .all_branches_collapsed=0 screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command .sort_key=IO_RATE .tree_sort_key=PID -.tree_view=0 .tree_view_always_by_pid=0 +.tree_view=0 .sort_direction=-1 .tree_sort_direction=1 .all_branches_collapsed=0 diff --git a/nixos/flake.lock b/nixos/flake.lock index 9569d0ca..6e743dc0 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1710164657, - "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=", + "lastModified": 1710452332, + "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2", + "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9", "type": "github" }, "original": { @@ -694,7 +694,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-JvFwRyTxBMPjQfWH7oyGN8vwJH8w/s80V8tDvxr935o=", + "narHash": "sha256-/j8RpaKS3M26QXE61bqjZPBiaPwEiO5P9pJ2imA1bD4=", "path": "../dotfiles/config/taffybar", "type": "path" }, @@ -816,11 +816,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1710190312, - "narHash": "sha256-Q6Lf+e3PZAFq/XzZnYghTgxERcSQcGOdT4nMA0Pe4s0=", + "lastModified": 1710366336, + "narHash": "sha256-eJeZ3vMbuC351B6CH4mqcpuZJ9RgtdRcxvhd7X2++Nk=", "owner": "NixOS", "repo": "nix", - "rev": "90e86bf6d3f0c031b8fa2f7e68ce8457d2601ea4", + "rev": "c152c2767a262b772c912287e1c2d85173b4781c", "type": "github" }, "original": { @@ -919,11 +919,11 @@ }, "nixpkgs-regression_2": { "locked": { - "lastModified": 1710222952, - "narHash": "sha256-g2dKSinZjjX1FEtFAXCqv6EX/e6oq40LXyGuhM5AnCk=", + "lastModified": 1710455890, + "narHash": "sha256-Ecfz+YhCEtj0KZhI90fiW21QqneOd5HpvMeJGzlN72Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a07fe6bab84a49f606af07dc82304781a9dae388", + "rev": "30ccdc28ecb2060cfe01d679aa8a4304631a41b5", "type": "github" }, "original": { @@ -982,11 +982,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { @@ -1366,11 +1366,11 @@ }, "unstable": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "type": "github" }, "original": { diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix index f1322b35..70715c4c 100644 --- a/nixos/home-manager.nix +++ b/nixos/home-manager.nix @@ -19,7 +19,6 @@ defaultCacheTtl = 8 * 60 * 60; maxCacheTtl = 8 * 60 * 60; enableSshSupport = true; - pinentryFlavor = "qt"; extraConfig = '' allow-emacs-pinentry allow-loopback-pinentry diff --git a/nixos/machines/strixy-minaj.nix b/nixos/machines/strixy-minaj.nix new file mode 100644 index 00000000..f608b510 --- /dev/null +++ b/nixos/machines/strixy-minaj.nix @@ -0,0 +1,64 @@ +{ config, lib, pkgs, inputs, forEachUser, ... }: + +{ + imports = [ + ../configuration.nix + ]; + + modules.base.enable = true; + modules.desktop.enable = true; + modules.xmonad.enable = true; + modules.extra.enable = false; + modules.code.enable = true; + modules.games.enable = false; + modules.syncthing.enable = true; + modules.fonts.enable = true; + modules.nixified-ai.enable = false; + modules.gitea-runner.enable = false; + + hardware.enableRedistributableFirmware = true; + + environment.systemPackages = with pkgs; [ + android-studio + ]; + + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "thunderbolt" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + services.xserver = { + videoDrivers = [ "intel" ]; + }; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; + # hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ]; + # hardware.nvidia.modesetting.enable = true; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/fc06a54c-cc45-423a-914b-8dfcb5939106"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/B28A-829A"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/27f277a0-b552-43a0-904d-625e48922bb9"; } + ]; + + networking.hostName = "strixy-minaj"; + + powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + home-manager.users = forEachUser { + home.stateVersion = "23.05"; + }; + + system.stateVersion = "23.05"; +} diff --git a/nixos/users.nix b/nixos/users.nix index a6d00406..119f1bfe 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -28,6 +28,11 @@ in home = "/var/lib/syncthing"; createHome = true; }; + ivanm = userDefaults // { + extraGroups = extraGroupsWithWheel; + name = "ivanm"; + openssh.authorizedKeys.keys = kanivanKeys; + }; imalison = userDefaults // { extraGroups = extraGroupsWithWheel; name = "imalison";