From 5bae6c9d0e26215322acb1538499c56e4fabbcb8 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Mon, 31 Jul 2023 19:25:14 -0400 Subject: [PATCH] updated to 23.05 --- flake.lock | 34 ++++++--------------- flake.nix | 4 +-- hosts/katana/default.nix | 2 -- hosts/katana/system-pkgs.nix | 47 ++++++++++++++--------------- machines/katana.nix | 2 ++ modules/home-manager/eww.nix | 2 +- modules/system/services/openssh.nix | 10 +++--- users/speccon18/default.nix | 3 +- users/speccon18/home.nix | 1 - 9 files changed, 45 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index f302b34..72b1c17 100644 --- a/flake.lock +++ b/flake.lock @@ -99,20 +99,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1679738842, - "narHash": "sha256-CvqRbsyDW756EskojZptDU590rez29RcHDV3ezoze08=", + "lastModified": 1687871164, + "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", "owner": "nix-community", "repo": "home-manager", - "rev": "83110c259889230b324bb2d35bef78bf5f214a1f", + "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -318,16 +317,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1690726002, + "narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "391e8db1f06c3f74c2d313a73135515023af3993", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -423,21 +422,6 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1618cea..31f3603 100644 --- a/flake.nix +++ b/flake.nix @@ -2,14 +2,14 @@ description = "respec's nixos configs"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix.url = github:Mic92/sops-nix; devenv.url = "github:cachix/devenv/latest"; hyprland.url = "github:hyprwm/Hyprland"; xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; disko = { diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix index 2bbb0dd..121a917 100644 --- a/hosts/katana/default.nix +++ b/hosts/katana/default.nix @@ -55,8 +55,6 @@ extraOptions = ''experimental-features = nix-command flakes''; # Auto maintainence settings.auto-optimise-store = lib.mkDefault true; - # Prevent tampering of the pkgstore - readOnlyStore = true; # Garbage collection gc = { automatic = true; diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix index bc71cd6..73d4b39 100644 --- a/hosts/katana/system-pkgs.nix +++ b/hosts/katana/system-pkgs.nix @@ -1,29 +1,28 @@ { modulesPath, config, pkgs, lib, self, ... }: { environment.systemPackages = with pkgs; [ - ripgrep - tree - cargo - feh - unrar - unzip - gzip - p7zip - bzip2 - dconf2nix - rustc - bat - exa - mdbook - uutils-coreutils - htop - zsh - dig #dns lookup - rage #file encryption - age-plugin-yubikey #plugin for rage to manage yubi-2fa - sops #file based secrets operations - direnv #used for development environments - python39 - gcc + ripgrep + tree + cargo + unrar + unzip + gzip + p7zip + bzip2 + dconf2nix + rustc + bat + exa + mdbook + uutils-coreutils + htop + zsh + dig #dns lookup + rage #file encryption + age-plugin-yubikey #plugin for rage to manage yubi-2fa + sops #file based secrets operations + direnv #used for development environments + python39 + gcc ]; } \ No newline at end of file diff --git a/machines/katana.nix b/machines/katana.nix index f1d77d9..eea732b 100644 --- a/machines/katana.nix +++ b/machines/katana.nix @@ -16,6 +16,8 @@ }; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; + # Prevent tampering of the pkgstore + readOnlyNixStore = true; }; fileSystems."/" = { diff --git a/modules/home-manager/eww.nix b/modules/home-manager/eww.nix index 0df93ac..270c708 100644 --- a/modules/home-manager/eww.nix +++ b/modules/home-manager/eww.nix @@ -1,6 +1,6 @@ { programs.eww = { - enable=true; + enable=false; configDir=../../dotfiles/eww; }; } \ No newline at end of file diff --git a/modules/system/services/openssh.nix b/modules/system/services/openssh.nix index 61569a6..232b6e5 100644 --- a/modules/system/services/openssh.nix +++ b/modules/system/services/openssh.nix @@ -4,11 +4,13 @@ services.openssh = lib.mkDefault { enable = true; openFirewall = true; - passwordAuthentication = false; - permitRootLogin = "no"; - kbdInteractiveAuthentication = false; startWhenNeeded = true; - kexAlgorithms = [ "curve25519-sha256@libssh.org" ]; + settings = { + KexAlgorithms = [ "curve25519-sha256@libssh.org" ]; + PermitRootLogin = "no"; + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; + }; }; security.pam = lib.mkDefault { enableSSHAgentAuth = true; diff --git a/users/speccon18/default.nix b/users/speccon18/default.nix index dee8fe8..838a764 100644 --- a/users/speccon18/default.nix +++ b/users/speccon18/default.nix @@ -1,5 +1,6 @@ { config, pkgs, lib, ... }: { + programs.zsh.enable = true; users.users.speccon18 = { shell = pkgs.zsh; isNormalUser = true; @@ -8,7 +9,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILdigmndcdQD/864P059K2hZOXyEkbGvMkH0/b2QavkD speccon18@creatorforge" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPc1AQ6hcjdSZZuhS5SISwtulFoTLpC5f5JoMFQkZ5l2 specCon18@DESKTOP-Q1I2PAE" ]; - description = "admin"; + description = "Steven Carpenter"; extraGroups = [ "wheel" "docker" ]; }; } \ No newline at end of file diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix index 05f53e9..b70877c 100644 --- a/users/speccon18/home.nix +++ b/users/speccon18/home.nix @@ -13,7 +13,6 @@ firefox discord nodejs-18_x - nerdfonts fira-code gimp obsidian