diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.sops.yaml b/.sops.yaml old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock old mode 100644 new mode 100755 index 1c07c07..65d4949 --- a/flake.lock +++ b/flake.lock @@ -288,6 +288,26 @@ "type": "github" } }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1761395627, + "narHash": "sha256-9wQpgBRW2PzYw1wx+MgCt1IbPAYz93csApLMgSZOJCk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7296022150cd775917e4c831c393026eae7c2427", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "mnw": { "locked": { "lastModified": 1758834834, @@ -442,6 +462,7 @@ "copyparty": "copyparty", "disko": "disko", "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_2", diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 index d4c59f1..1497c0f --- a/flake.nix +++ b/flake.nix @@ -10,11 +10,15 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-homebrew.url = "github:zhaofengli/nix-homebrew"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager-unstable = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + nix-homebrew.url = "github:zhaofengli/nix-homebrew"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -70,7 +74,7 @@ specialArgs = {inherit inputs stable_pkgs unstable_pkgs;}; modules = [ ./hosts/nixos/yveltal/configuration.nix - inputs.home-manager.nixosModules.default + inputs.home-manager-unstable.nixosModules.default inputs.disko.nixosModules.disko ./hosts/nixos/yveltal/disko.nix ]; diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix old mode 100644 new mode 100755 diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix old mode 100644 new mode 100755 diff --git a/hosts/nixos/snowbelle/configuration.nix b/hosts/nixos/snowbelle/configuration.nix old mode 100644 new mode 100755 diff --git a/hosts/nixos/snowbelle/hardware-configuration.nix b/hosts/nixos/snowbelle/hardware-configuration.nix old mode 100644 new mode 100755 diff --git a/hosts/nixos/vaniville/configuration.nix b/hosts/nixos/vaniville/configuration.nix old mode 100644 new mode 100755 diff --git a/hosts/nixos/yveltal/configuration.nix b/hosts/nixos/yveltal/configuration.nix old mode 100644 new mode 100755 index 9d9d9f8..47bef20 --- a/hosts/nixos/yveltal/configuration.nix +++ b/hosts/nixos/yveltal/configuration.nix @@ -11,7 +11,7 @@ ]; home-manager.users.blake.imports = [ - ../../../users/blake/hosts/yveltal + ../../../users/blake/hosts/yveltal.nix ]; system = { diff --git a/hosts/nixos/yveltal/disko.nix b/hosts/nixos/yveltal/disko.nix old mode 100644 new mode 100755 index dd123d3..0409697 --- a/hosts/nixos/yveltal/disko.nix +++ b/hosts/nixos/yveltal/disko.nix @@ -3,7 +3,7 @@ disk = { main = { type = "disk"; - device = ""; # disk id here + device = "/dev/disk/by-id/nvme-PC_SN530_NVMe_WDC_512GB_210513807733"; # disk id here content = { type = "gpt"; partitions = { diff --git a/hosts/nixos/yveltal/hardware-configuration.nix b/hosts/nixos/yveltal/hardware-configuration.nix new file mode 100644 index 0000000..5d69991 --- /dev/null +++ b/hosts/nixos/yveltal/hardware-configuration.nix @@ -0,0 +1,59 @@ +# 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" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-partlabel/disk-main-luks"; + + fileSystems."/.swapvol" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@swap" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-partlabel/disk-main-ESP"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + fileSystems."/home" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; + + swapDevices = [ ]; + + # 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.wlp0s20f3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/desktop/hypr/default.nix b/modules/desktop/hypr/default.nix old mode 100644 new mode 100755 diff --git a/modules/gameservers/minecraft_recpro/default.nix b/modules/gameservers/minecraft_recpro/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/copyparty/default.nix b/modules/holocron/copyparty/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/default.nix b/modules/holocron/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/nfs/default.nix b/modules/holocron/nfs/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/perms/default.nix b/modules/holocron/perms/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/smb/default.nix b/modules/holocron/smb/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/syncthing/default.nix b/modules/holocron/syncthing/default.nix old mode 100644 new mode 100755 diff --git a/modules/holocron/zfs/default.nix b/modules/holocron/zfs/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/.default.nix.template.nix b/modules/homelab/.default.nix.template.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/arr/bazarr/default.nix b/modules/homelab/arr/bazarr/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/arr/flaresolverr/default.nix b/modules/homelab/arr/flaresolverr/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/arr/prowlarr/default.nix b/modules/homelab/arr/prowlarr/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/arr/radarr/default.nix b/modules/homelab/arr/radarr/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/arr/sonarr/default.nix b/modules/homelab/arr/sonarr/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/audiobookshelf/default.nix b/modules/homelab/audiobookshelf/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/backups/default.nix b/modules/homelab/backups/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/caddy/default.nix b/modules/homelab/caddy/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/default.nix b/modules/homelab/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/gitea/default.nix b/modules/homelab/gitea/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/glance/default.nix b/modules/homelab/glance/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/home/homeassistant/default.nix b/modules/homelab/home/homeassistant/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/home/mosquitto/default.nix b/modules/homelab/home/mosquitto/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/home/zigbee2mqtt/default.nix b/modules/homelab/home/zigbee2mqtt/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/immich/default.nix b/modules/homelab/immich/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/jellyfin/default.nix b/modules/homelab/jellyfin/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/motd/default.nix b/modules/homelab/motd/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/postfix/default.nix b/modules/homelab/postfix/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/postfix/default.nix.icloud_attempt b/modules/homelab/postfix/default.nix.icloud_attempt old mode 100644 new mode 100755 diff --git a/modules/homelab/qbittorrent/default.nix b/modules/homelab/qbittorrent/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/uptime-kuma/default.nix b/modules/homelab/uptime-kuma/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/vaultwarden/default.nix b/modules/homelab/vaultwarden/default.nix old mode 100644 new mode 100755 diff --git a/modules/homelab/yacreader/default.nix b/modules/homelab/yacreader/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/default.nix b/modules/system/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/docker/default.nix b/modules/system/docker/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/nvidia/default.nix b/modules/system/nvidia/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/podman/default.nix b/modules/system/podman/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/sops/default.nix b/modules/system/sops/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/ssh/default.nix b/modules/system/ssh/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/syncthing/default.nix b/modules/system/syncthing/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/tailscale/default.nix b/modules/system/tailscale/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/vpn-confinement/default.nix b/modules/system/vpn-confinement/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/vpns/default.nix b/modules/system/vpns/default.nix old mode 100644 new mode 100755 diff --git a/modules/system/yubikey/default.nix b/modules/system/yubikey/default.nix old mode 100644 new mode 100755 diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml old mode 100644 new mode 100755 diff --git a/users/blake/assets/wallpapers/antartica.png b/users/blake/assets/wallpapers/antartica.png old mode 100644 new mode 100755 diff --git a/users/blake/default.nix b/users/blake/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/.default.nix b/users/blake/dots/.default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/darwin/default.nix b/users/blake/dots/darwin/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/git/default.nix b/users/blake/dots/git/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/gpg/default.nix b/users/blake/dots/gpg/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/hypr/default.nix b/users/blake/dots/hypr/default.nix old mode 100644 new mode 100755 index 60b7cde..30278fb --- a/users/blake/dots/hypr/default.nix +++ b/users/blake/dots/hypr/default.nix @@ -5,6 +5,7 @@ }: { home.packages = with pkgs; [ nwg-displays + posy-cursors ]; @@ -33,7 +34,7 @@ kb_layout = "us"; numlock_by_default = true; follow_mouse = 2; - sensitivity = -0.6; + sensitivity = -0.2; touchpad = { disable_while_typing = true; @@ -48,10 +49,8 @@ gaps_in = 2; gaps_out = 5; border_size = 3; - col = { - active_border = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - inactive_border = "rgba(595959aa)"; - }; + "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; + "col.inactive_border" = "rgba(595959aa)"; layout = "dwindle"; allow_tearing = false; }; @@ -87,7 +86,7 @@ }; gestures = { - workspace_swipe = "on"; + workspace = "on"; }; misc = { @@ -210,15 +209,15 @@ services.hyprpaper = { enable = true; settings = { - preload = [ "~/.nix/user/blake/assets/wallpapers/antartica.png" ]; - wallpaper = [ ",~/.nix/user/blake/assets/wallpapers/antartica.png" ]; + preload = [ "~/.nix/users/blake/assets/wallpapers/antartica.png" ]; + wallpaper = [ ",~/.nix/users/blake/assets/wallpapers/antartica.png" ]; ipc = "off"; splash = false; }; }; # screenlocker - services.hyprlock = { + programs.hyprlock = { enable = true; settings = { general = { @@ -229,7 +228,7 @@ background = [ { monitor = ""; - path = "~/pictures/wallpapers/antartica.png"; + path = "~/.nix/users/blake/assets/wallpapers/antartica.png"; blur_passes = 1; color = "rgb(0047ab)"; } @@ -362,8 +361,9 @@ }; home.pointerCursor = { + enable = false; gtk.enable = true; - # x11.enable = true; + x11.enable = true; package = pkgs.posy-cursors; name = "posy"; size = 48; diff --git a/users/blake/dots/hypr/hypridle.conf b/users/blake/dots/hypr/hypridle.conf old mode 100644 new mode 100755 diff --git a/users/blake/dots/hypr/hyprland.conf b/users/blake/dots/hypr/hyprland.conf old mode 100644 new mode 100755 diff --git a/users/blake/dots/hypr/hyprlock.conf b/users/blake/dots/hypr/hyprlock.conf old mode 100644 new mode 100755 diff --git a/users/blake/dots/hypr/hyprpaper.conf b/users/blake/dots/hypr/hyprpaper.conf old mode 100644 new mode 100755 diff --git a/users/blake/dots/kitty/default.nix b/users/blake/dots/kitty/default.nix old mode 100644 new mode 100755 index 50c36a2..cdf0cbe --- a/users/blake/dots/kitty/default.nix +++ b/users/blake/dots/kitty/default.nix @@ -6,7 +6,7 @@ }: { programs.kitty = { enable = true; - enableZshIntegration = true; +# enableZshIntegration = true; enableGitIntegration = true; #darwinLaunchOptions = [""]; settings = { @@ -17,7 +17,7 @@ cursor_shape = "beam"; cursor_beam_thickness = 2.5; foreground = "#dddddd"; - background = "#2F1730Q"; + background = "#2F1730"; background_opacity = 0.9; selection_foreground = "none"; selection_background = "none"; diff --git a/users/blake/dots/lf/ctpv_config b/users/blake/dots/lf/ctpv_config old mode 100644 new mode 100755 diff --git a/users/blake/dots/lf/default.nix b/users/blake/dots/lf/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/lf/lfrc b/users/blake/dots/lf/lfrc old mode 100644 new mode 100755 diff --git a/users/blake/dots/neovim/default.nix b/users/blake/dots/neovim/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/ssh/default.nix b/users/blake/dots/ssh/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/stylix/default.nix b/users/blake/dots/stylix/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/dots/xdg/default.nix b/users/blake/dots/xdg/default.nix old mode 100644 new mode 100755 index 1927dc3..fa6a2c2 --- a/users/blake/dots/xdg/default.nix +++ b/users/blake/dots/xdg/default.nix @@ -7,22 +7,22 @@ xdg = if pkgs.system == "x86_64-darwin" then {} else { enable = true; - configHome = "${config.home.homeDirectory}/.config"; - cacheHome = "${config.home.homeDirectory}/.cache"; - dataHome = "${config.home.homeDirectory}/.local/share"; - stateHome = "${config.home.homeDirectory}/.local/state"; + configHome = "/home/blake/.config"; + cacheHome = "/home/blake/.cache"; + dataHome = "/home/blake/.local/share"; + stateHome = "/home/blake/.local/state"; userDirs = { enable = true; # writes ~/.config/user-dirs.dirs - desktop = "${config.home.homeDirectory}/desktop"; - download = "${config.home.homeDirectory}/downloads"; - documents = "${config.home.homeDirectory}/documents"; - pictures = "${config.home.homeDirectory}/pictures"; - videos = "${config.home.homeDirectory}/videos"; - music = "${config.home.homeDirectory}/music"; - publicShare = "${config.home.homeDirectory}/public"; - templates = "${config.home.homeDirectory}/templates"; + desktop = "/home/blake/desktop"; + download = "/home/blake/downloads"; + documents = "/home/blake/documents"; + pictures = "/home/blake/pictures"; + videos = "/home/blake/videos"; + music = "/home/blake/music"; + publicShare = "/home/blake/public"; + templates = "/home/blake/templates"; }; }; diff --git a/users/blake/dots/zsh/default.nix b/users/blake/dots/zsh/default.nix old mode 100644 new mode 100755 diff --git a/users/blake/home.nix b/users/blake/home.nix old mode 100644 new mode 100755 diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix old mode 100644 new mode 100755 diff --git a/users/blake/os/darwin.nix b/users/blake/os/darwin.nix old mode 100644 new mode 100755 diff --git a/users/blake/os/nixos.nix b/users/blake/os/nixos.nix old mode 100644 new mode 100755 diff --git a/users/blake/secrets/secrets.yaml b/users/blake/secrets/secrets.yaml old mode 100644 new mode 100755 diff --git a/users/default.nix b/users/default.nix old mode 100644 new mode 100755