diff --git a/flake.lock b/flake.lock index aaca325..5aada37 100644 --- a/flake.lock +++ b/flake.lock @@ -27,16 +27,15 @@ ] }, "locked": { - "lastModified": 1685721552, - "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=", + "lastModified": 1685999310, + "narHash": "sha256-gaRMZhc7z4KeU/xS3IWv3kC+WhVcAXOLXXGKLe5zn1Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "29519461834c08395b35f840811faf8c23e3b61c", + "rev": "28614ed7a1e3ace824c122237bdc0e5e0b62c5c3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "home-manager", "type": "github" } @@ -57,11 +56,27 @@ "type": "github" } }, + "nur": { + "locked": { + "lastModified": 1686095819, + "narHash": "sha256-Z8Gas0gxUAiIQmFjaX41C74+NK5gVk424xsYEesMZQE=", + "owner": "nix-community", + "repo": "NUR", + "rev": "59874cc9831e3891765e33d54ae9c0917f9de810", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nur": "nur" } } }, diff --git a/flake.nix b/flake.nix index 3d032a8..7aa7897 100644 --- a/flake.nix +++ b/flake.nix @@ -4,25 +4,22 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager = { - url = "github:nix-community/home-manager/master"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + disko.url = "github:nix-community/disko"; + disko.inputs.nixpkgs.follows = "nixpkgs"; + nur.url = "github:nix-community/NUR"; }; - outputs = { self, nixpkgs, home-manager, disko }: + outputs = { self, nixpkgs, home-manager, disko, nur }: let system = "x86_64-linux"; overlays = [ - (self: super: { - nur = import (builtins.fetchTarball { - url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; - sha256 = "0a4jcks8nb4sb581gvd8kza9sw41bc8d1jdz4bv16plb9anfvcc0"; - }); + (final: prev: { + nur = import nur { + inherit (prev) pkgs; + nurpkgs = nixpkgs.legacyPackages.x86_64-linux; + }; }) ]; pkgs = import nixpkgs { @@ -31,7 +28,6 @@ allowUnfree = true; }; }; - in { nixosConfigurations.desktop = nixpkgs.lib.nixosSystem { @@ -42,7 +38,7 @@ home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.brain = import ./homeConfig/home.nix; + home-manager.users.bryan = import ./homeConfig/home.nix; } ]; }; diff --git a/homeConfig/home.nix b/homeConfig/home.nix index 9d88851..91144a1 100644 --- a/homeConfig/home.nix +++ b/homeConfig/home.nix @@ -5,8 +5,8 @@ imports = [ (import ./modules/default.nix) ]; home.stateVersion = "22.11"; - home.username = "brain"; - home.homeDirectory = "/home/brain"; + home.username = "bryan"; + home.homeDirectory = "/home/bryan"; modules = { gui.enable = true; diff --git a/homeConfig/modules/browsers/config/brain.nix b/homeConfig/modules/browsers/config/bryan.nix similarity index 100% rename from homeConfig/modules/browsers/config/brain.nix rename to homeConfig/modules/browsers/config/bryan.nix diff --git a/homeConfig/modules/browsers/default.nix b/homeConfig/modules/browsers/default.nix index aeb06c7..27e5d01 100644 --- a/homeConfig/modules/browsers/default.nix +++ b/homeConfig/modules/browsers/default.nix @@ -9,7 +9,7 @@ in config = mkIf cfg.enable { programs.firefox = { enable = true; - profiles.brain = import config/brain.nix { inherit pkgs; }; + profiles.bryan = import config/bryan.nix { inherit pkgs; }; }; home.packages = with pkgs; [ diff --git a/sysConfig/desktop/system.nix b/sysConfig/desktop/system.nix index 8d2282a..efd8097 100644 --- a/sysConfig/desktop/system.nix +++ b/sysConfig/desktop/system.nix @@ -9,7 +9,7 @@ extraOptions = "experimental-features = nix-command flakes"; settings = { auto-optimise-store = true; - trusted-users = [ "brain" ]; + trusted-users = [ "bryan" ]; }; gc = { automatic = true; @@ -33,10 +33,12 @@ }; # Users - users.users.brain = { + users.users.bryan = { isNormalUser = true; extraGroups = [ "wheel" "networkmanager" "home-manager" "input" "video" "audio" "kvm" "libvirtd" "docker" ]; - openssh.authorizedKeys.keyFiles = [ /home/brain/.ssh/authorized_keys ]; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDl4895aB9P5p/lp8Hq5rHun4clvhyTSHFi3U2d6OOBoW5Fm+VcQnW/xbjmCBsXk5BdiowsBxQhwnzdfz/KJL7J5RobomUEaVRwb9UwT88eJveLp14BG8j2J3SjfyhrCX+4jkPx0bPQk1HGcuYY+tPEXf1q/ps88Dhu0CARBIzYQOTYY6b1qWzxpDoFZGHjKG8g5iY6FIu65yKKvvVy1f8IgZ3l3IpwBWVamxgkTcYY0QYSrmzo1n7TXxwrWbvenAqBsQ0cBPs+gVa3uIr+1TJl0Az5SElBVGu3LvUdlk58trtPUj6TQR3YUkg7Vjll7WHOdqhux5ZQNhjkOsHerf0Tw86e6cEzgeTuIbQHIb0LcsUunwKcuh2+au7RO599cvHn0+xZE5MZBxloDDaJ3JsiliM8kyPP/U3ERj03cWLW7BqbT+sfjAOl21RCzk0iQxk1wt/8VmtCr9Adv7IyrtaYvf/bwRP+g+9ldmzKGt8Mdb605uVzZ70H/LLm17f40Te+QHaex5by/6p6cuwEEZtgIg53Wpglu0rA6UxrBfQEHKl/Jt3FLeE0mnEyYkkR2MnHNtyWRIXtuqYZMAm2Ub1pFHH7jQV1gGiDVTw6a2eIwK21a/hXtRjFUpFd1nB1n+KNfJBE4zT3wm3Ud7mKw/6rWnoRyhYZvGXkFdp+iEs49Q==" + ]; }; security.sudo = { @@ -51,7 +53,7 @@ cron = { enable = true; systemCronJobs = [ - "0 0 * * * brain /home/brain/Documents/scripts/lnbackup_script.sh" + "0 0 * * * bryan /home/bryan/Documents/scripts/lnbackup_script.sh" ]; }; }; @@ -93,7 +95,6 @@ enable = true; startWhenNeeded = true; settings = { - permitRootLogin = false; X11Forwarding = true; PasswordAuthentication = false; };