diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/common.nix | 74 | ||||
| -rw-r--r-- | hosts/nixios/default.nix | 30 | ||||
| -rw-r--r-- | hosts/nixios/hardware-configuration.nix | 54 |
3 files changed, 64 insertions, 94 deletions
diff --git a/hosts/common.nix b/hosts/common.nix index 5ea1619..17f5c92 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -27,36 +27,6 @@ flake = "/home/${user}/.config/beeSystems"; }; - # programs.ssh.extraConfig = '' - # Host eu.nixbuild.net - # PubkeyAcceptedKeyTypes ssh-ed25519 - # ServerAliveInterval 60 - # IPQoS throughput - # IdentityFile /home/bee/my-nixbuild-key - # ''; - # - # programs.ssh.knownHosts = { - # nixbuild = { - # hostNames = [ "eu.nixbuild.net" ]; - # publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM"; - # }; - # }; - # - # nix = { - # distributedBuilds = true; - # buildMachines = [ - # { - # hostName = "eu.nixbuild.net"; - # system = "x86_64-linux"; - # maxJobs = 100; - # supportedFeatures = [ - # "benchmark" - # "big-parallel" - # ]; - # } - # ]; - # }; - boot.loader = { efi.canTouchEfiVariables = true; timeout = 50; @@ -65,13 +35,9 @@ device = "nodev"; efiSupport = true; useOSProber = true; + splashImage = null; + theme = null; configurationLimit = 4; - theme = pkgs.fetchFromGitHub { - owner = "shvchk"; - repo = "fallout-grub-theme"; - rev = "80734103d0b48d724f0928e8082b6755bd3b2078"; - sha256 = "sha256-7kvLfD6Nz4cEMrmCA9yq4enyqVyqiTkVZV5y4RyUatU="; - }; }; }; @@ -81,39 +47,21 @@ extraDefCfg = "process-unmapped-keys yes"; config = '' - ;; Define the physical keys on your keyboard that we want to modify (defsrc esc caps rctrl f1 ) - ;; Define custom actions (Aliases) (defalias - ;; The smart key: - ;; - Tap: Sends Esc - ;; - Hold: Sends Left Control - ;; - "press": If you press another key while holding this, it triggers - ;; Left Control IMMEDIATELY (no lag). Perfect for Vim. capesc (tap-hold-press 200 200 esc lctrl) - ;; Switches to toggle between layers game (layer-switch gaming) base (layer-switch base) ) - ;; 3. Base Layer (Typing Mode) - ;; - Physical Esc -> Caps Lock (Standard swap) - ;; - Physical Caps -> Esc (tap) / Ctrl (hold) - ;; - Physical RCtrl -> Switch to "Gaming Mode" - ;; - Physical F1 -> Normal F1 behavior (deflayer base caps @capesc @game f1 ) - ;; 4. Gaming Layer (Gaming Mode) - ;; - Physical Esc -> Caps Lock (keeps light toggle working) - ;; - Physical Caps -> Left Ctrl (Pure Ctrl! Safe for crouching) - ;; - Physical RCtrl -> Switch back to "Typing Mode" - ;; - Physical F1 -> Escape (Your dedicated Pause button) (deflayer gaming caps lctrl @base esc ) @@ -176,7 +124,7 @@ alsa.support32Bit = true; pulse.enable = true; wireplumber.enable = true; - jack.enable = true; + jack.enable = false; }; security.rtkit.enable = true; @@ -197,16 +145,18 @@ fonts.fontDir.enable = true; fonts.packages = with pkgs; [ - # ioskeley-mono ioskeley-input + nerd-fonts.symbols-only + # ioskeley-mono # maple-mono.NF - nerd-fonts.jetbrains-mono + # nerd-fonts.jetbrains-mono ]; + fonts.fontconfig.defaultFonts.monospace = [ - "JetBrainsMono Nerd Font" - "Ioskeley Mono" + "IosevkaInput" "Symbols Nerd Font" ]; + programs.fish.enable = true; programs.nano.enable = false; programs.gnupg.agent = { @@ -217,7 +167,7 @@ sops = { defaultSopsFile = ../secrets/secrets.yaml; - age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + age.keyFile = "/home/bee/.config/sops/age/keys.txt"; secrets.gpg_private_key = { owner = user; mode = "0400"; @@ -256,7 +206,7 @@ services.gnome.gnome-keyring.enable = true; services.power-profiles-daemon.enable = true; services.printing.enable = false; - services.openssh.enable = true; + services.openssh.enable = false; services.dbus.enable = true; services.gvfs.enable = true; @@ -267,8 +217,6 @@ playerctl pciutils imagemagick - pavucontrol - bluetui sops fd ripgrep diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix index e72aad5..7920378 100644 --- a/hosts/nixios/default.nix +++ b/hosts/nixios/default.nix @@ -17,36 +17,16 @@ beeMods ]; - services.logind = { - settings.Login = { - HandleLidSwitch = "suspend"; - HandleLidSwitchExternalPower = "suspend"; - LidSwitchIgnoreInhibited = "no"; - }; - }; - - # REMOVE LATER - virtualisation.vmVariant = { - users.users.${user}.password = "1"; - users.users.root.password = "1"; - - virtualisation.memorySize = 4096; - virtualisation.cores = 4; - services.displayManager.ly.enable = lib.mkForce false; - - services.getty.helpLine = ">> WELCOME <<"; - services.getty.autologinUser = user; - }; - # REMOVE LATER - boot.kernelPackages = pkgs.linuxPackages_zen; programs.dconf.enable = true; beeMods = { - mango.enable = true; - hyprland.enable = false; - dwm.enable = true; + windowManagers = { + mango.enable = false; + hyprland.enable = true; + dwm.enable = true; + }; }; xdg.portal = lib.mkForce { diff --git a/hosts/nixios/hardware-configuration.nix b/hosts/nixios/hardware-configuration.nix index 7e2a1c3..96c39c3 100644 --- a/hosts/nixios/hardware-configuration.nix +++ b/hosts/nixios/hardware-configuration.nix @@ -1,8 +1,6 @@ # 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. - -# yes i did modify it. { config, lib, @@ -10,6 +8,7 @@ modulesPath, ... }: + { imports = [ (modulesPath + "/installer/scan/not-detected.nix") @@ -27,12 +26,55 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-label/NIXROOT"; - fsType = "ext4"; + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/home" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@home" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@nix" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; + }; + + fileSystems."/var/log" = { + device = "/dev/disk/by-uuid/85c4da5f-b234-498f-bf47-f2d3b26bf0cc"; + fsType = "btrfs"; + options = [ + "subvol=@log" + "compress=zstd" + "noatime" + "discard=async" + "space_cache=v2" + ]; }; fileSystems."/boot" = { - device = "/dev/disk/by-label/NIXBOOT"; + device = "/dev/disk/by-uuid/DD2D-BC85"; fsType = "vfat"; options = [ "fmask=0022" @@ -41,7 +83,7 @@ }; swapDevices = [ - { device = "/dev/disk/by-label/NIXSWAP"; } + { device = "/dev/disk/by-uuid/247afe44-bbc1-4931-bf26-29a540e9d7df"; } ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; |