diff --git a/flake.lock b/flake.lock index 0419a6a..847ba1a 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1771610171, - "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=", + "lastModified": 1770895474, + "narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d", + "rev": "a494d50d32b5567956b558437ceaa58a380712f7", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1772020340, - "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", + "lastModified": 1770260404, + "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", + "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", "type": "github" }, "original": { @@ -393,11 +393,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1772145952, - "narHash": "sha256-GTiei2dsAZJg6wL76X6+9a8l4+0QpIwAUX1qAbPs10s=", + "lastModified": 1771583642, + "narHash": "sha256-mKVhOB/bChKUdaDu/RJCqaWXORrCiCeYPvmvQxhPSIE=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "193530a5114811f659a7c8f85041a5e1d920df8f", + "rev": "52991d23ad7ae88ec4eb6ece5c90fadc3d660335", "type": "github" }, "original": { @@ -409,11 +409,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1772146530, - "narHash": "sha256-OO9GGq5lxft8wlzqQQLyQ4ueHDXOZ6gN8hCLDBpS508=", + "lastModified": 1771577856, + "narHash": "sha256-B+tR08bn8+FJ/hk8BmGqV3tQvqftsm9MlhNRNgGFzfs=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "dd1dcf6acc7565169fd9296274a61c421675f236", + "rev": "3c90b72f62f5930e7adadbd98c7873159dd09129", "type": "github" }, "original": { @@ -517,11 +517,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1772129629, - "narHash": "sha256-vUCMHuxPNd7PKy1mQsjRUDIHvI4eMbbJxl/iNwzWmGM=", + "lastModified": 1771522877, + "narHash": "sha256-uCi2y7Y0hgw81Vet26nLidq/xZZEpdlkWj8aZKItaMI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "70cdd819e4bee3c4dcea6961d32e61e6afe4eeb0", + "rev": "9ea6d0e15fddccf321c035e83b007a55d6829dd9", "type": "github" }, "original": { @@ -593,11 +593,11 @@ ] }, "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "lastModified": 1770899531, + "narHash": "sha256-UBrWjh0DR8db60aLNkTnZTJ9F4kWK0Y7rUDNJC88W7A=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "rev": "e03c34ccd51280a44ea6d1f5c040cd81ecca25ed", "type": "github" }, "original": { @@ -647,11 +647,11 @@ ] }, "locked": { - "lastModified": 1771866172, - "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=", + "lastModified": 1767983607, + "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41", + "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", "type": "github" }, "original": { @@ -724,11 +724,11 @@ ] }, "locked": { - "lastModified": 1771271487, - "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=", + "lastModified": 1770139857, + "narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d", + "rev": "9038eec033843c289b06b83557a381a2648d8fa5", "type": "github" }, "original": { @@ -778,11 +778,11 @@ ] }, "locked": { - "lastModified": 1771606233, - "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=", + "lastModified": 1770203293, + "narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a", + "rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98", "type": "github" }, "original": { @@ -909,11 +909,11 @@ ] }, "locked": { - "lastModified": 1772129556, - "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=", + "lastModified": 1767634391, + "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "ebec37af18215214173c98cf6356d0aca24a2585", + "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2", "type": "github" }, "original": { @@ -964,11 +964,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771969195, - "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -1026,11 +1026,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -1058,11 +1058,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1771207753, - "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { @@ -1074,11 +1074,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -1170,11 +1170,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1771903837, - "narHash": "sha256-sdaqdnsQCv3iifzxwB22tUwN/fSHoN7j2myFW5EIkGk=", + "lastModified": 1771419570, + "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e764fc9a405871f1f6ca3d1394fb422e0a0c3951", + "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", "type": "github" }, "original": { @@ -1262,11 +1262,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1772149051, - "narHash": "sha256-0RZrMDnRi9igkYp/kWCnBMOfIR7nzNHjVZH1mCmZ8h0=", + "lastModified": 1771581385, + "narHash": "sha256-Yu5ehDh4rtd3Ow6VyXEEuQ40DzD14oe0R8kXFUtIGBs=", "owner": "nix-community", "repo": "NUR", - "rev": "6948ca433b5f4803810cd491e0fe03b85739ea07", + "rev": "5bdc2edf13c2dbbbb7d4ce9228fc01cdb5254ed2", "type": "github" }, "original": { @@ -1302,7 +1302,7 @@ "oisd": { "flake": false, "locked": { - "narHash": "sha256-ndlZLSepheV0YuGO+3yfG59EuqLBCWENR6q0JKFGjho=", + "narHash": "sha256-j/o31zDLIhL7Kec6NAoyIMuO7Woh+2e/JzWMzqVuKpo=", "type": "file", "url": "https://big.oisd.nl/domainswild" }, @@ -1321,11 +1321,11 @@ ] }, "locked": { - "lastModified": 1771858127, - "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "type": "github" }, "original": { @@ -1441,11 +1441,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1772048434, - "narHash": "sha256-/wA0OaH6kZ/pFA+nXR/tvg5oupOmEDmMS5us79JT60o=", + "lastModified": 1771524872, + "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "334daa7c273dd8bf7a0cd370e4e16022b64e55e9", + "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", "type": "github" }, "original": { @@ -1460,11 +1460,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1771737804, - "narHash": "sha256-7wn9qbzIQQgH8tnq4VwzuWEqEWpekuymlLyhY3vM/j8=", + "lastModified": 1771268051, + "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "6dd43010ac2458cc56a6ac5250349b9217a7a2ae", + "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", "type": "github" }, "original": { diff --git a/hosts/azalea/default.nix b/hosts/azalea/default.nix index c7e62e9..ed3d33f 100644 --- a/hosts/azalea/default.nix +++ b/hosts/azalea/default.nix @@ -11,6 +11,7 @@ ]; security.pam.services.sudo_local.touchIdAuth = true; + nix.settings.experimental-features = "nix-command flakes"; # system.configurationRevision = self.rev or self.dirtyRev or null; system = { primaryUser = "liv"; diff --git a/hosts/violet/default.nix b/hosts/violet/default.nix index 12b7f5c..b9e9a0c 100644 --- a/hosts/violet/default.nix +++ b/hosts/violet/default.nix @@ -39,7 +39,6 @@ 80 443 25565 - 25567 5201 ]; allowedUDPPorts = [ diff --git a/modules/core/nixos.nix b/modules/core/nixos.nix deleted file mode 100644 index 5eed0ad..0000000 --- a/modules/core/nixos.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - self, - pkgs, - lib, - inputs, - ... -}: -{ - nix = { - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - }; - - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ ]; - }; - - services.envfs.enable = true; - - system.stateVersion = "24.05"; -} diff --git a/modules/core/system.nix b/modules/core/system.nix index 08cdebd..c4c5e0b 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -3,30 +3,35 @@ pkgs, lib, inputs, - system, ... }: { - imports = - (lib.optionals (system == "x64_64-linux") [ (import ./i18n.nix) ]) - ++ (lib.optionals (system == "aarch64-linux") [ (import ./i18n.nix) ]) - ++ (lib.optionals (system == "x64_64-linux") [ (import ./nixos.nix) ]) - ++ (lib.optionals (system == "aarch64-linux") [ (import ./nixos.nix) ]); - nix = { settings = { + download-buffer-size = 67108864; # Set buffer size to 64MB for large downloads + allowed-users = [ "@wheel" ]; + auto-optimise-store = true; experimental-features = [ "nix-command" "flakes" ]; - download-buffer-size = 67108864; # Set buffer size to 64MB for large downloads - allowed-users = [ "@wheel" ]; # substituters = [ "http://violet.booping.local" ]; # trusted-public-keys = [ "violet.booping.local:2gshN3xfGSL7eKFc8tGkqSoIb3WQxuB2RJ8DuakLLqc=%" ]; }; - optimise.automatic = true; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; + }; }; + programs.nix-ld = { + enable = true; + libraries = with pkgs; [ ]; + }; + + services.envfs.enable = true; + nixpkgs = { overlays = [ self.overlays.default @@ -37,9 +42,9 @@ nixpkgs.config = { allowUnfree = true; permittedInsecurePackages = [ - # "jitsi-meet-1.0.8043" - # "olm-3.2.16" - # "libsoup-2.74.3" + "jitsi-meet-1.0.8043" + "olm-3.2.16" + "libsoup-2.74.3" ]; overlays = [ self.overlays.default @@ -48,6 +53,8 @@ ]; }; + # powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + # Font packages environment.systemPackages = with pkgs; [ noto-fonts-cjk-sans @@ -55,8 +62,14 @@ ipaexfont ]; + i18n.defaultLocale = "en_US.UTF-8"; + i18n.supportedLocales = [ + "en_US.UTF-8/UTF-8" + "ja_JP.UTF-8/UTF-8" + ]; time.timeZone = lib.mkDefault "Europe/Amsterdam"; environment.variables = { LC_TIME = "C.UTF-8"; }; + system.stateVersion = "24.05"; } diff --git a/modules/core/user-linux.nix b/modules/core/user-linux.nix deleted file mode 100644 index 4bfa680..0000000 --- a/modules/core/user-linux.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ username, ... }: -{ - users.users.${username} = { - isNormalUser = true; - extraGroups = [ - "networkmanager" - "wheel" - "docker" - "input" - "dialout" - "wheel" - ]; - initialPassword = "temporary-password"; - }; - - home-manager = { - inherit username; - homeDirectory = "/home/${username}"; - }; - - fonts.fontconfig.antialias = false; -} diff --git a/modules/core/user.nix b/modules/core/user.nix index 51f83a4..aa2c3ec 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -1,26 +1,18 @@ { pkgs, inputs, + config, username, host, - lib, - system, ... }: { imports = - (lib.optionals (system == "x64_64-linux") [ inputs.home-manager.nixosModules.home-manager ]) - ++ (lib.optionals (system == "aarch64-darwin") [ inputs.home-manager.darwinModules.home-manager ]) - ++ (lib.optionals (system == "x64_64-linux") [ ./../../roles/default.nix ]) - ++ (lib.optionals (system == "aarch64-linux") [ ./../../roles/default.nix ]) - ++ (lib.optionals (system == "x64_64-linux") [ ./user-linux.nix ]) - ++ (lib.optionals (system == "aarch64-linux") [ ./user-linux.nix ]) - ++ (lib.optionals (system == "x64_64-linux") [ ./sops.nix ]) - ++ (lib.optionals (system == "aarch64-linux") [ ./sops.nix ]) + [ inputs.home-manager.nixosModules.home-manager ] + ++ [ ./../../roles/default.nix ] + ++ [ ./sops.nix ] ++ [ ./../../variables.nix ]; - home-manager = { - backupFileExtension = "bak"; useUserPackages = true; useGlobalPkgs = true; extraSpecialArgs = { inherit inputs username host; }; @@ -38,33 +30,34 @@ [ ./../home/default.server.nix ] else if (host == "daisy") then [ ./../home/default.server.nix ] - else if (system == "aarch64-darwin") then - [ ./../home/default.azalea.nix ] + # else if (host == "yoshino") then + # [ ./../home/default.nix ] else [ ./../home ]; home = { - username = "liv"; + username = "${username}"; + homeDirectory = "/home/${username}"; stateVersion = "22.11"; - sessionVariables = { - EDITOR = "nvim"; - VISUAL = "nvim"; - PAGER = "less"; - }; }; programs.home-manager.enable = true; }; }; + fonts.fontconfig.antialias = false; + users.users.${username} = { - home = - if (system == "x64_64-linux") then - "/home/${username}" - else if (system == "aarch64-darwin") then - "/Users/${username}" - else - "/home/${username}"; + isNormalUser = true; + description = "${username}"; + extraGroups = [ + "networkmanager" + "wheel" + "docker" + "input" + "dialout" + "wheel" + ]; shell = pkgs.zsh; - description = "ahwx"; + initialPassword = "temporary-password"; }; nix.settings.allowed-users = [ "${username}" ]; } diff --git a/modules/home/fonts.nix b/modules/home/fonts.nix index 93abc8a..be7ed7b 100644 --- a/modules/home/fonts.nix +++ b/modules/home/fonts.nix @@ -1,5 +1,7 @@ { pkgs, ... }: { + fonts.fontconfig.antialias = false; + home.packages = with pkgs; [ scientifica # nerd-fonts._0xproto diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix index 7b1458e..d74381d 100644 --- a/modules/home/kitty.nix +++ b/modules/home/kitty.nix @@ -11,8 +11,6 @@ }; settings = { - hide_window_decorations = "yes"; - background_blur = "16"; confirm_os_window_close = 0; background_opacity = "0.75"; window_padding_width = 10; diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix index 77768af..dbde6ba 100644 --- a/modules/home/zsh.nix +++ b/modules/home/zsh.nix @@ -53,16 +53,6 @@ initContent = '' export PATH="''${PATH}:''${HOME}/.local/bin/:''${HOME}/.cargo/bin/:''${HOME}/.fzf/bin/" - preview_cmd=' - if file --mime-type {} | grep -qF image/; then - kitten icat --clear --transfer-mode=memory --stdin=no --place=''${_KITTEN_ICAT_PLACE} {} > /dev/tty - else - printf "\\x1b_Ga=d,d=A\\x1b\\\\" && bat --color=always --style=header,grid --line-range :300 {} - fi - ' - - export FZF_CTRL_T_OPTS='--ansi --height 100% --layout=reverse --preview-window "right:60%" --preview '"'$preview_cmd'" - autoload -U add-zsh-hook autoload -U compinit zmodload zsh/complist @@ -278,7 +268,6 @@ diff = "${lib.getExe pkgs.delta} --color-only"; github-actions = "${lib.getExe pkgs.act} -s GITHUB_TOKEN=\"$(${lib.getExe pkgs.github-cli} auth token)\""; tailscale = "sudo tailscale"; - finder = "open -a Finder"; # NixOS ns = "nix-shell --run zsh";