Merge branch 'main' of github.com:jbowdre/dotfiles

.example_work_profile/README.md

@@ -7,4 +7,4 @@ This repo demonstrates how I use a private repo to overlay my work-specific conf
 2. `cd` into the private repo.
 3. Run `home-manager switch --flake .#<username>@<hostname>` to activate the work profile (and then use the `switch-home` function to (re)activate it in the future).
 
-When the public `dotfiles` repo gets updated, I run `nix flake lock --update-input dotfiles` to pull in the changes before doing `switch-home` to reapply the config.
+When the public `dotfiles` repo gets updated, I use the `update-dotfiles` function to pull in the changes (`nix flake lock --update-input dotfiles ${config.home.homeDirectory}/.dotfiles/`) and reapply the config (`switch-home`).

.gitignore

@@ -14,3 +14,6 @@ result
 __pycache__
 **.pyc
 
+node_modules/
+package-lock.json
+package.json

flake.lock

@@ -9,11 +9,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1699070557,
+        "lastModified": 1701921769,
-        "narHash": "sha256-PXP+kzgKCnn6h5S8HP1rsDmfZLW8sxR3SSa1bPlz63A=",
+        "narHash": "sha256-7yjhJkx4KL6ky1kUvxy57rm/qH1bmnawI6OZk9+sYR0=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "1cc05065f3f2d2dbf7b099a232da4c7cfc77ee76",
+        "rev": "acfb6a9e679bb21eca5d8ad28008188d3a199777",
         "type": "gitlab"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1699044561,
+        "lastModified": 1701656485,
-        "narHash": "sha256-3uHmbq74CicpBPP40a6NHp830S7Rvh33uFgfIIC+7nw=",
+        "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "87f8403371fa74d9ad21ed677403cc235f37b96c",
+        "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
         "type": "github"
       },
       "original": {
@@ -60,43 +60,26 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
+        "lastModified": 1701728041,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1699110214,
+        "lastModified": 1701718080,
-        "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=",
+        "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee",
+        "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1698924604,
-        "narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
         "type": "github"
       },
       "original": {
@@ -106,13 +89,29 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1701802827,
+        "narHash": "sha256-wTn0lpV75Uv6tU6haEypNsmnJJPb0hpaMIy/4uf5AiQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a804fc878d7ba1558b960b4c64b0903da426ac41",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "firefox-addons": "firefox-addons",
         "hardware": "hardware",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-stable": "nixpkgs-stable"
       }
     }
   },

flake.nix

@@ -6,15 +6,15 @@
   # - https://github.com/Misterio77/nix-config/
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     # You can access packages and modules from different nixpkgs revs
     # at the same time. Here's a working example:
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
-    # Also see the 'unstable-packages' overlay at 'nix/overlays/default.nix'.
+    # Also see the 'stable-packages' overlay at 'nix/overlays/default.nix'.
 
     # Home manager
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.05";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

home/features/cli/default.nix

@@ -2,7 +2,7 @@
   # Core CLI apps
 
   imports = [
-    ./exa.nix
+    ./eza.nix
     ./git.nix
     ./fish.nix
     ./nix-index.nix

home/features/cli/eza.nix

@@ -1,5 +1,5 @@
 { lib, ... }: {
-  programs.exa = {
+  programs.eza = {
     enable = true;
     enableAliases = true;
     extraOptions = [

home/features/cli/fish.nix

@@ -9,7 +9,7 @@ in
     enable = true;
 
     shellAbbrs = rec {
-      ccat = "egrep -v '^\s*(#|$)'";
+      ccat = "egrep -v '^\s*(#|\\$)'";
       g = "git";
       ga = "git add";
       gc = "git commit";      # interactive commit

home/features/desktop/default.nix

@@ -2,11 +2,11 @@
   # Common GUI apps
   imports = [
     ./firefox.nix
-    ./obsidian.nix
     ./vscode.nix
   ];
 
   home.packages = with pkgs; [
+    obsidian
     qFlipper
   ];
 }

home/features/desktop/obsidian.nix

@@ -1,5 +0,0 @@
-{ pkgs, inputs, outputs, lib, ... }: {
-  home.packages = with pkgs.unstable; [
-    obsidian
-  ];
-}

home/features/desktop/vscode.nix

@@ -8,7 +8,7 @@
     enable = true;
     enableExtensionUpdateCheck = false;
     enableUpdateCheck = false;
-    package = pkgs.unstable.vscode;
+    package = pkgs.vscode;
     extensions = with pkgs.vscode-extensions; [
       # extensions available as nix packages
       bbenoist.nix
@@ -146,7 +146,7 @@
       "editor.acceptSuggestionOnEnter" = "off";
       "editor.detectIndentation" = false;
       "editor.inlineSuggest.enabled" = true;
-      "editor.lineNumbers" = "on";
+      "editor.lineNumbers" = "relative";
       "editor.renderControlCharacters" = true;
       "editor.renderWhitespace" = "all";
       "editor.tabCompletion" = "off";

overlays/default.nix

@@ -13,10 +13,10 @@
     # });
   };
 
-  # When applied, the unstable nixpkgs set (declared in the flake inputs) will
+  # When applied, the stable nixpkgs set (declared in the flake inputs) will
-  # be accessible through 'pkgs.unstable'
+  # be accessible through 'pkgs.stable'
-  unstable-packages = final: _prev: {
+  stable-packages = final: _prev: {
-    unstable = import inputs.nixpkgs-unstable {
+    stable = import inputs.nixpkgs-stable {
       system = final.system;
       config.allowUnfree = true;
     };