From de588a1fe5be142cb72f85d172f0d9ef2d1d246b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 29 Oct 2024 06:56:02 -0600 Subject: update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a837d5c..e80f0c1 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1728902391, - "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "catppuccin-alacritty": { "flake": false, "locked": { - "lastModified": 1721489199, - "narHash": "sha256-5MUWHXs8vfl2/u6YXB4krT5aLutVssPBr+DiuOdMAto=", + "lastModified": 1730074245, + "narHash": "sha256-H8bouVCS46h0DgQ+oYY8JitahQDj0V9p2cOoD4cQX+Q=", "owner": "catppuccin", "repo": "alacritty", - "rev": "343cf8d65459ac8f6449cc98dd3648bcbd7e3766", + "rev": "f6cb5a5c2b404cdaceaff193b9c52317f62c62f7", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729641085, - "narHash": "sha256-xNP2Ip8YUaNekTpq9Oj7DTbFdHVSZJ/u7y2HkdS2f/c=", + "lastModified": 1730143527, + "narHash": "sha256-oAHpNAIa6EKt3uTIxCbIbEsuPdvE8en1iIXlgLHDbps=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2b6ff6837e81a3b459f2f3cc366830c420a7a62e", + "rev": "d679d200299ed4670f0d0f138c793d5f507b7cec", "type": "github" }, "original": { @@ -491,11 +491,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729449015, - "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89172919243df199fe237ba0f776c3e3e3d72367", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -538,11 +538,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { -- cgit v1.2.3 From cbcaca059177635d1c920ce3be385d5474a99a80 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 30 Oct 2024 04:11:08 -0600 Subject: update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e80f0c1..7e920df 100644 --- a/flake.lock +++ b/flake.lock @@ -491,11 +491,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729973466, - "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { -- cgit v1.2.3 From 6ff62a2b220a5bcbad12b5a60a8b61d6fdd0aeab Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 5 Nov 2024 20:49:55 -0700 Subject: add pop as user for work --- flake.nix | 1 + modules/users/jerry.nix | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 modules/users/jerry.nix diff --git a/flake.nix b/flake.nix index 004cacf..a0e46b1 100644 --- a/flake.nix +++ b/flake.nix @@ -287,6 +287,7 @@ ./modules/users/defin.nix ./modules/users/root.nix + ./modules/users/jerry.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/modules/users/jerry.nix b/modules/users/jerry.nix new file mode 100644 index 0000000..b9f8b95 --- /dev/null +++ b/modules/users/jerry.nix @@ -0,0 +1,22 @@ +{config, pkgs, lib, ... }: { + + # Define a user account. Don't forget to set a password with ‘passwd’. + users = { + + users.jerry = { + isNormalUser = true; + description = "Jerry Finlinson"; + extraGroups = [ "input" "wireshark" ]; # (wheel) Enable ‘sudo’ for the user. + shell = pkgs.nushell; + }; + }; + + security.pam = { + sshAgentAuth.enable = true; + # services.sudo.sshAgentAuth = true; + }; + # I can't think of a better spot to put this rn. + services.openssh = { + ports = [ 22 2200 ]; # needed because isp blocks ssh over 22 + }; +} -- cgit v1.2.3 From 3fe8aefab1d3cc6d05a34026426424de3d680443 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 6 Nov 2024 12:34:00 -0700 Subject: enable vm host --- machines/doretta/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/doretta/configuration.nix b/machines/doretta/configuration.nix index 99dca37..98cdbf2 100644 --- a/machines/doretta/configuration.nix +++ b/machines/doretta/configuration.nix @@ -22,6 +22,7 @@ virtualisation.libvirtd = { enable = true; }; + virtualisation.vmware.host.enable = true; # Set your time zone. time.timeZone = "US/Mountain"; -- cgit v1.2.3 From 74c86b6278ff5aa5f7fcefc31e569eb89ce6151d Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Wed, 6 Nov 2024 13:07:59 -0700 Subject: don't want hyprland on work laptop --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index a0e46b1..73a44ae 100644 --- a/flake.nix +++ b/flake.nix @@ -276,8 +276,6 @@ ./machines/betsy/configuration.nix # lix-module.nixosModules.default - ./modules/nixos/hyprland.nix - ./modules/nixos/bluetooth.nix ./modules/nixos/nix-common.nix ./modules/nixos/environment.nix -- cgit v1.2.3 From aab2ecc4bb577e35baf97c032e7404339f4f0bfb Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 7 Nov 2024 10:05:08 -0700 Subject: setting up vm host --- flake.nix | 2 +- home-manager/doretta.nix | 122 ++++++++++++++++++++++++++++++++++ machines/doretta/configuration.nix | 2 +- modules/home-manager/virt-manager.nix | 8 +++ modules/users/defin.nix | 2 +- 5 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 home-manager/doretta.nix create mode 100644 modules/home-manager/virt-manager.nix diff --git a/flake.nix b/flake.nix index 73a44ae..0c963e1 100644 --- a/flake.nix +++ b/flake.nix @@ -312,7 +312,7 @@ home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.defin = import ./home-manager/default.nix; + home-manager.users.defin = import ./home-manager/doretta.nix; home-manager.extraSpecialArgs = { inherit inputs; }; } ]; diff --git a/home-manager/doretta.nix b/home-manager/doretta.nix new file mode 100644 index 0000000..3096662 --- /dev/null +++ b/home-manager/doretta.nix @@ -0,0 +1,122 @@ +{ config, pkgs, ... }: +# let +# home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz"; +# unstable = import {}; +# in +{ + imports = [ + ../modules/home-manager/starship.nix + ../modules/home-manager/btop.nix + ../modules/home-manager/helix.nix + ../modules/home-manager/shell.nix + ../modules/home-manager/bat.nix + ../modules/home-manager/virt-manager.nix + ]; + + nixpkgs = { + # texlive.combined.scheme-medium; + # system = "x84_64-linux"; + config.allowUnfree = true; + }; + + # home-manager.users.defin= { + home = { + # Home Manager needs a bit of information about you and the paths it should + # manage. + username = "defin"; + homeDirectory = "/home/defin"; + + # This value determines the Home Manager release that your configuration is + # compatible with. This helps avoid breakage when a new Home Manager release + # introduces backwards incompatible changes. + # + # You should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + stateVersion = "23.11"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + packages = with pkgs; [ + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + pass + btop # better top + starship + eza # better ls + zoxide # better cd + broot # tree view files + procs # process view + gnupg + #helix plugins + # vadimcn.vscode-lldb + # yaml-language-server + # typescript-language-server + # rust-analyzer + # solargraph + # clangd + # vscode-json-language-server + # lua-language-server + # marksman + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + + # You can also manage environment variables but you will have to manually + # source + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/defin/etc/profile.d/hm-session-vars.sh + # + # if you don't want to manage your shell through Home Manager. + sessionVariables = { + EDITOR = "hx"; + }; + }; + + programs = { + ssh.matchBlocks = { + serverAliveCountMax = 6; + serverAliveInterval = 30; + port = 2200; + "git.wormcar.gay" = { + user = "devinf"; + host = "git.wormcar.gay"; + port = 2200; + }; + }; + git = { + enable = true; + userName = "Devin Finlinson"; + userEmail = "devin.finlinson@pm.me"; + includes = [{path = "~/.gitconfig.local";}]; + extraConfig = { + core = {editor = "hx";}; + pull = {rebase = false;}; + }; + }; + + # Let Home Manager install and manage itself. + # home-manager.enable = true; + }; +} diff --git a/machines/doretta/configuration.nix b/machines/doretta/configuration.nix index 98cdbf2..0d20b83 100644 --- a/machines/doretta/configuration.nix +++ b/machines/doretta/configuration.nix @@ -22,7 +22,7 @@ virtualisation.libvirtd = { enable = true; }; - virtualisation.vmware.host.enable = true; + programs.virt-manager.enable = true; # Set your time zone. time.timeZone = "US/Mountain"; diff --git a/modules/home-manager/virt-manager.nix b/modules/home-manager/virt-manager.nix new file mode 100644 index 0000000..b8bb430 --- /dev/null +++ b/modules/home-manager/virt-manager.nix @@ -0,0 +1,8 @@ +{ inputs, ... }: { + dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = ["qemu:///system"]; + uris = ["qemu:///system"]; + }; + }; +} \ No newline at end of file diff --git a/modules/users/defin.nix b/modules/users/defin.nix index 24863d6..8931187 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -7,7 +7,7 @@ users.defin = { isNormalUser = true; description = "Devin Finlinson"; - extraGroups = [ "wheel" "builders" "video" "input" "docker" "dialout" "wireshark" "networkmanager" ]; # (wheel) Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "builders" "video" "input" "docker" "dialout" "wireshark" "networkmanager" "libvirtd" ]; # (wheel) Enable ‘sudo’ for the user. shell = pkgs.nushell; hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; -- cgit v1.2.3 From ce3ec8ad7367ce44be14a4f04f981b9aab1cd56b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 8 Nov 2024 12:42:25 -0700 Subject: better printer drivers --- modules/nixos/services.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index f7c22ba..daa07d7 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -32,7 +32,7 @@ # Enable CUPS to print documents. printing = { enable = true; - drivers = with pkgs; [ epson-escpr gutenprint ]; + drivers = with pkgs; [ epson-escpr2 epsonscan2 gutenprint ]; }; avahi = { enable = true; -- cgit v1.2.3