diff --git a/flake.nix b/flake.nix index 5e5a055..59dd57b 100644 --- a/flake.nix +++ b/flake.nix @@ -303,19 +303,6 @@ auto-cpufreq.nixosModules.default ./hosts/tyr/configuration.nix ./modules/linux/nixos - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.extraSpecialArgs = {inherit inputs;}; - home-manager.backupFileExtension = "backup"; - home-manager.users.crony = { - imports = [ - ./modules/linux/home-manager - ./modules/cross-platform/home-manager - ./hosts/tyr/home.nix - ]; - }; - } ]; }; diff --git a/hosts/tyr/configuration.nix b/hosts/tyr/configuration.nix index 369f2d6..3ddfe70 100644 --- a/hosts/tyr/configuration.nix +++ b/hosts/tyr/configuration.nix @@ -1,5 +1,4 @@ { - config, inputs, pkgs, ... @@ -68,16 +67,16 @@ users.users.crony = { isNormalUser = true; description = "Crony"; - hashedPasswordFile = "${config.age.secrets.crony-passwd.path}"; + # hashedPasswordFile = "${config.age.secrets.crony-passwd.path}"; extraGroups = ["networkmanager" "wheel" "video" "input" "audio" "gamemode" "seat" "realtime"]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJLduAXHWJiglmfRfkBGKffzVWkJP6porxIzw6+Zz3W crony@cronyakatsuki.xyz" ]; }; - users.users.root.hashedPasswordFile = "${config.age.secrets.root-passwd.path}"; + # users.users.root.hashedPasswordFile = "${config.age.secrets.root-passwd.path}"; - users.mutableUsers = false; + # users.mutableUsers = false; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -127,9 +126,11 @@ services.fail2ban = { enable = true; + ignoreIP = [ + "65.21.241.194" + ]; }; - # Enable my specific settings crony.secrets.enable = true; # Enable nixd to see nixpkgs path diff --git a/hosts/tyr/home.nix b/hosts/tyr/home.nix deleted file mode 100644 index 12fa4d5..0000000 --- a/hosts/tyr/home.nix +++ /dev/null @@ -1,18 +0,0 @@ -{inputs, ...}: { - imports = [ - inputs.nvf.homeManagerModules.default - inputs.nix-index-database.homeModules.nix-index - inputs.nix-flatpak.homeManagerModules.nix-flatpak - inputs.agenix.homeManagerModules.default - ]; - - # Some info - home.username = "crony"; - home.homeDirectory = "/home/crony"; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - - # DO NOT CHANGE - home.stateVersion = "24.11"; # Please read the comment before changing. -} diff --git a/hosts/ymir/home.nix b/hosts/ymir/home.nix index f4aad8e..441a24f 100644 --- a/hosts/ymir/home.nix +++ b/hosts/ymir/home.nix @@ -37,12 +37,6 @@ crony.hyprland.enable = true; crony.home-secrets.enable = true; crony.restic.enable = true; - crony.neovim.enable = true; - crony.qutebrowser.enable = true; - crony.mpv.enable = true; - crony.browsers.enable = true; - crony.desktop.enable = true; - crony.shell-additions.enable = true; # DO NOT CHANGE ALSO home.stateVersion = "24.11"; # Please read the comment before changing. diff --git a/modules/cross-platform/home-manager/default.nix b/modules/cross-platform/home-manager/default.nix index d976115..8c347b6 100644 --- a/modules/cross-platform/home-manager/default.nix +++ b/modules/cross-platform/home-manager/default.nix @@ -7,7 +7,7 @@ ./zsh.nix ]; - crony.neovim.enable = lib.mkDefault false; + crony.neovim.enable = lib.mkDefault true; crony.shell.enable = lib.mkDefault true; crony.tmux.enable = lib.mkDefault true; crony.zsh.enable = lib.mkDefault true; diff --git a/modules/linux/home-manager/default.nix b/modules/linux/home-manager/default.nix index 43a36c6..9cdeab0 100644 --- a/modules/linux/home-manager/default.nix +++ b/modules/linux/home-manager/default.nix @@ -23,18 +23,18 @@ crony.river.enable = lib.mkDefault false; crony.wayland.enable = lib.mkDefault false; - crony.qutebrowser.enable = lib.mkDefault false; + crony.qutebrowser.enable = lib.mkDefault true; crony.mangohud.enable = lib.mkDefault false; crony.nnn.enable = lib.mkDefault true; - crony.mpv.enable = lib.mkDefault false; + crony.mpv.enable = lib.mkDefault true; crony.obs-studio.enable = lib.mkDefault false; crony.restic.enable = lib.mkDefault false; crony.hyprland.enable = lib.mkDefault false; - crony.browsers.enable = lib.mkDefault false; + crony.browsers.enable = lib.mkDefault true; crony.emulators.enable = lib.mkDefault false; - crony.desktop.enable = lib.mkDefault false; + crony.desktop.enable = lib.mkDefault true; crony.gaming.enable = lib.mkDefault false; - crony.shell-additions.enable = lib.mkDefault false; + crony.shell-additions.enable = lib.mkDefault true; crony.flatpak.enable = lib.mkDefault false; crony.newsboat.enable = lib.mkDefault false; crony.xdg-user-dirs.enable = lib.mkDefault true;