mthomson/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update all deps

Browse Source
This commit is contained in:
Michael Thomson
2025-12-02 11:18:49 -05:00
parent dfd4b364fd
commit b81a57ddb8
27 changed files with 533 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
flake.lock generated
View File

@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1759499898,
"narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
"lastModified": 1763922789,
"narHash": "sha256-XnkWjCpeXfip9tqYdL0b0zzBDjq+dgdISvEdSVGdVyA=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
"rev": "a20a0e67a33b6848378a91b871b89588d3a12573",
"type": "github"
},
"original": {
@@ -109,11 +109,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1760665859,
"narHash": "sha256-unj4PQ+m+io2QFOEf+apE2xGHK+wqZNf9RFrv7gJ4N8=",
"lastModified": 1764667911,
"narHash": "sha256-a6+pjl0UELkSB+Wata6eQlvhnM3iRQfxy8Vl1HOfsG0=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "f756d347e72aa238f14fd53ea8f825a86996f30d",
"rev": "a8ce1761cde35c96690ff8ef7643b77df58ffa40",
"type": "github"
},
"original": {
@@ -141,11 +141,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
@@ -157,11 +157,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
@@ -232,18 +232,20 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1748186689,
"narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
"host": "gitlab.gnome.org",
"lastModified": 1762869044,
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
"type": "github"
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
"type": "gitlab"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "48.2",
"ref": "gnome-49",
"repo": "gnome-shell",
"type": "github"
"type": "gitlab"
}
},
"home-manager": {
@@ -253,11 +255,11 @@
]
},
"locked": {
"lastModified": 1760662441,
"narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
"lastModified": 1764636297,
"narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "722792af097dff5790f1a66d271a47759f477755",
"rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827",
"type": "github"
},
"original": {
@@ -311,11 +313,11 @@
]
},
"locked": {
"lastModified": 1759490292,
"narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
"lastModified": 1763733840,
"narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
"rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
"type": "github"
},
"original": {
@@ -329,8 +331,8 @@
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor",
"hyprgraphics": "hyprgraphics",
"hyprland-guiutils": "hyprland-guiutils",
"hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
@@ -340,11 +342,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1760621586,
"narHash": "sha256-sIbe3te3RrL9PY4ASKGwv1KuJs0pyn4Zvo3xIF3jFms=",
"lastModified": 1764607679,
"narHash": "sha256-1Bsem6lhJWMQmkLIml5oKOL+z1dYMewZ6ql0K35Y3TA=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "8164b90bc2839d4d2a10c0d2b26c4a413ecf90b2",
"rev": "f82a8630d7a51dab4cc70924f500bf70e723db12",
"type": "github"
},
"original": {
@@ -353,6 +355,52 @@
"type": "github"
}
},
"hyprland-guiutils": {
"inputs": {
"aquamarine": [
"hyprland",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprtoolkit": "hyprtoolkit",
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1763727565,
"narHash": "sha256-vRff/2R1U1jzPBy4OODqh2kfUzmizW/nfV2ROzTDIKo=",
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"rev": "7724d3a12a0453e7aae05f2ef39474219f05a4b4",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-guiutils",
"type": "github"
}
},
"hyprland-plugins": {
"inputs": {
"hyprland": [
@@ -370,11 +418,11 @@
]
},
"locked": {
"lastModified": 1760659005,
"narHash": "sha256-wyS6tXYJuzbwckOeaCoRtT4qIG2UZ0YvSZx7EBNjTV0=",
"lastModified": 1764636589,
"narHash": "sha256-8j0QzbFF3QindJZ0DVEwLA1Ty1/4t4hcU5zHGQ2meI8=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
"rev": "a5a6f93d72d5fb37e78b98c756cfd8b340e71a19",
"rev": "8f796f7cec39e7a9aa2bb65d28006025e1bc14ae",
"type": "github"
},
"original": {
@@ -395,11 +443,11 @@
]
},
"locked": {
"lastModified": 1749046714,
"narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
"lastModified": 1759610243,
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
"type": "github"
},
"original": {
@@ -408,74 +456,6 @@
"type": "github"
}
},
"hyprland-qt-support": {
"inputs": {
"hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"systems"
]
},
"locked": {
"lastModified": 1749154592,
"narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=",
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qt-support",
"type": "github"
}
},
"hyprland-qtutils": {
"inputs": {
"hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1759080228,
"narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [
@@ -492,11 +472,11 @@
]
},
"locked": {
"lastModified": 1758927902,
"narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
"lastModified": 1763819661,
"narHash": "sha256-0jLarTR/BLWdGlboM86bPVP2zKJNI2jvo3JietnDkOM=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
"rev": "a318deec0c12409ec39c68d2be8096b636dc2a5c",
"type": "github"
},
"original": {
@@ -505,6 +485,58 @@
"type": "github"
}
},
"hyprtoolkit": {
"inputs": {
"aquamarine": [
"hyprland",
"hyprland-guiutils",
"aquamarine"
],
"hyprgraphics": [
"hyprland",
"hyprland-guiutils",
"hyprgraphics"
],
"hyprlang": [
"hyprland",
"hyprland-guiutils",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-guiutils",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprland-guiutils",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"hyprland-guiutils",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-guiutils",
"systems"
]
},
"locked": {
"lastModified": 1763503177,
"narHash": "sha256-VPoiswJBBmTLVuNncvT/8FpFR+sYcAi/LgP/zTZ+5rA=",
"owner": "hyprwm",
"repo": "hyprtoolkit",
"rev": "f4e1e12755567ecf39090203b8f43eace8279630",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprtoolkit",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
@@ -517,11 +549,11 @@
]
},
"locked": {
"lastModified": 1759619523,
"narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
"lastModified": 1763996058,
"narHash": "sha256-DsqzFZvrEV+aDmavjaD4/bk5qxeZwhGxPWBQdpFyM9Y=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
"rev": "0168583075baffa083032ed13a8bea8ea12f281a",
"type": "github"
},
"original": {
@@ -542,11 +574,11 @@
]
},
"locked": {
"lastModified": 1755184602,
"narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
"lastModified": 1763640274,
"narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
"rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671",
"type": "github"
},
"original": {
@@ -562,11 +594,11 @@
]
},
"locked": {
"lastModified": 1760338583,
"narHash": "sha256-IGwy02SH5K2hzIFrKMRsCmyvwOwWxrcquiv4DbKL1S4=",
"lastModified": 1764161084,
"narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "9a9ab01072f78823ca627ae5e895e40d493c3ecf",
"rev": "e95de00a471d07435e0527ff4db092c84998698e",
"type": "github"
},
"original": {
@@ -628,11 +660,11 @@
},
"nixCats": {
"locked": {
"lastModified": 1759730664,
"narHash": "sha256-boRlBQ/c4CaHsK/z04QL6+t81mcar37Io94HBX2GflY=",
"lastModified": 1764009888,
"narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
"owner": "BirdeeHub",
"repo": "nixCats-nvim",
"rev": "77dffad8235eb77684fcb7599487c8e9f23d5b8f",
"rev": "16ac3281f322ea15d39843829e42a44d22da3715",
"type": "github"
},
"original": {
@@ -643,11 +675,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1760106635,
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"lastModified": 1764440730,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"type": "github"
},
"original": {
@@ -663,11 +695,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1760536587,
"narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=",
"lastModified": 1764591717,
"narHash": "sha256-T/HMA0Bb/O6UnlGQ0Xt+wGe1j8m7eyyQ5+vVcCJslsM=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea",
"rev": "84d1dab290feb4865d0cfcffc7aa0cf9bc65c3b7",
"type": "github"
},
"original": {
@@ -679,11 +711,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1759381078,
"narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
"lastModified": 1763966396,
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
"type": "github"
},
"original": {
@@ -727,11 +759,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1760423683,
"narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=",
"lastModified": 1764560356,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github"
},
"original": {
@@ -743,11 +775,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1759733170,
"narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8913c168d1c56dc49a7718685968f38752171c3b",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
@@ -759,11 +791,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1760524057,
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
@@ -773,22 +805,6 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1758690382,
"narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
@@ -878,11 +894,11 @@
]
},
"locked": {
"lastModified": 1758108966,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"lastModified": 1763988335,
"narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",
"type": "github"
},
"original": {
@@ -931,7 +947,9 @@
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts",
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_4",
"nixpkgs": [
"nixpkgs"
],
"nur": "nur",
"systems": "systems_2",
"tinted-foot": "tinted-foot",
@@ -941,15 +959,15 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1760472212,
"narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=",
"owner": "danth",
"lastModified": 1764648840,
"narHash": "sha256-hIj3aKL+G8TXrqvz0wCnUKESN5MEyrD4YxaLLARnkPs=",
"owner": "nix-community",
"repo": "stylix",
"rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db",
"rev": "71054adbc3629404b2f02e8385aec07f87980a2f",
"type": "github"
},
"original": {
"owner": "danth",
"owner": "nix-community",
"repo": "stylix",
"type": "github"
}
@@ -1093,11 +1111,11 @@
]
},
"locked": {
"lastModified": 1755354946,
"narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
"lastModified": 1761431178,
"narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
"rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
"type": "github"
},
"original": {

12
flake.nix
View File

@@ -26,7 +26,10 @@
url = "github:BirdeeHub/nixCats-nvim";
};
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
stylix.url = "github:danth/stylix";
stylix = {
url = "github:nix-community/stylix";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
@@ -39,8 +42,7 @@
nix-on-droid,
nixos-wsl,
...
}:
{
}: {
nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@@ -83,9 +85,9 @@
};
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
pkgs = import nixpkgs { system = "aarch64-linux"; };
pkgs = import nixpkgs {system = "aarch64-linux";};
extraSpecialArgs = {inherit inputs;};
modules = [ ./hosts/android/configuration.nix ];
modules = [./hosts/android/configuration.nix];
};
};
}

8
hosts/android/configuration.nix
View File

@@ -1,6 +1,10 @@
{ config, lib, pkgs, inputs, ... }:
{
config,
lib,
pkgs,
inputs,
...
}: {
# Simply install just the packages
environment.packages = with pkgs; [
# User-facing stuff that you really really want to have

7
hosts/android/home.nix
View File

@@ -1,6 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}: {
# Read the changelog before changing this value
home.stateVersion = "24.05";

2
hosts/macbook/home.nix
View File

@@ -37,6 +37,8 @@
azure-cli.extensions.containerapp
])
nh
android-tools
todo-txt-cli
];
programs.home-manager.enable = true;

30
hosts/macvm/hardware-configuration.nix
View File

@@ -1,28 +1,32 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports = [ ];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "sr_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/9b7313b6-1939-4f81-b8fc-b17217fc59e7";
fileSystems."/" = {
device = "/dev/disk/by-uuid/9b7313b6-1939-4f81-b8fc-b17217fc59e7";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/EB32-81A0";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/EB32-81A0";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = ["fmask=0077" "dmask=0077"];
};
swapDevices = [ ];
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

32
hosts/thinkpad/hardware-configuration.nix
View File

@@ -1,30 +1,34 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/6212512c-31fc-4366-9756-a0aa05fd3c20";
fileSystems."/" = {
device = "/dev/disk/by-uuid/6212512c-31fc-4366-9756-a0aa05fd3c20";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A8AE-5CBB";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/A8AE-5CBB";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = ["fmask=0077" "dmask=0077"];
};
swapDevices = [ ];
swapDevices = [];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

12
hosts/wsl/configuration.nix
View File

@@ -1,13 +1,15 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
# NixOS-WSL specific options are documented on the NixOS-WSL repository:
# https://github.com/nix-community/NixOS-WSL
{ config, lib, pkgs, inputs, ... }:
{
config,
lib,
pkgs,
inputs,
...
}: {
imports = [
inputs.home-manager.nixosModules.default
../../modules/nixos/user.nix
@@ -50,7 +52,5 @@
};
};
system.stateVersion = "24.11";
}

5
modules/home-manager/bitwarden.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
programs = {
rbw = {
enable = true;

12
modules/home-manager/emacs/default.nix
View File

@@ -3,15 +3,12 @@
config,
inputs,
...
}:
let
}: let
myPkgs = import pkgs.path {
inherit (pkgs) system;
overlays = [ inputs.emacs-overlay.overlays.default ];
overlays = [inputs.emacs-overlay.overlays.default];
};
in
{
in {
home.packages = with pkgs; [
emacs-lsp-booster
tree-sitter
@@ -36,7 +33,8 @@ in
package = myPkgs.emacsWithPackagesFromUsePackage {
config = ./init.el;
defaultInitFile = false;
extraEmacsPackages = epkgs: with epkgs; [
extraEmacsPackages = epkgs:
with epkgs; [
mu4e
pdf-tools
vterm

2
modules/home-manager/email-personal.nix
View File

@@ -16,7 +16,7 @@
};
notmuch = {
enable = true;
new.tags = [ "new" ];
new.tags = ["new"];
hooks = {
postNew = ''
afew --tag --new

10
modules/home-manager/email-work.nix
View File

@@ -10,14 +10,8 @@
];
services = {
# mbsync = {
# enable = true;
# frequency = "*-*-* *:*/5:00";
# postExec = "\${pkgs.notmuch} new";
# };
vdirsyncer = {
enable = true;
#frequency = "*-*-* *:*/5:00";
};
};
@@ -68,7 +62,7 @@
};
notmuch = {
enable = true;
new.tags = [ "new" ];
new.tags = ["new"];
search.excludeTags = [
"trash"
"spam"
@@ -108,7 +102,7 @@
enable = true;
settings = {
replace_slash_with_dot = true;
ignore_tags = [ "new" "personal" "work" ];
ignore_tags = ["new" "personal" "work"];
};
};
};

15
modules/home-manager/git.nix
View File

@@ -3,14 +3,18 @@
config,
...
}: {
programs.git = {
enable = true;
userName = "Michael Thomson";
userEmail = "michael@michaelthomson.dev";
programs = {
diff-so-fancy = {
enable = true;
enableGitIntegration = true;
};
git = {
enable = true;
settings = {
user = {
name = "Michael Thomson";
email = "michael@michaelthomson.dev";
};
extraConfig = {
column = {
ui = "auto";
};
@@ -70,4 +74,5 @@
}
];
};
};
}

7
modules/home-manager/hledger.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
home.packages = with pkgs; [
hledger
hledger-ui
@@ -10,7 +7,7 @@
];
home.sessionVariables = {
LEDGER_FILE="~/finance/current.journal";
LEDGER_FILE = "~/finance/current.journal";
};
programs.ledger = {

5
modules/home-manager/network-manager-applet.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
services = {
network-manager-applet = {
enable = true;

43
modules/home-manager/nixcats/default.nix
View File

@@ -1,8 +1,14 @@
{ config, lib, inputs, ... }: let
{
config,
lib,
inputs,
...
}: let
utils = inputs.nixCats.utils;
in {
imports = [
inputs.nixCats.homeModule
../zk.nix
];
config = {
@@ -11,12 +17,20 @@ in {
};
nixCats = {
enable = true;
packageNames = [ "nvim" ];
packageNames = ["nvim"];
luaPath = ./.;
# for useage of this section, refer to :h nixCats.flake.outputs.categories
categoryDefinitions.replace = ({ pkgs, settings, categories, extra, name, mkPlugin, ... }@packageDef: {
categoryDefinitions.replace = {
pkgs,
settings,
categories,
extra,
name,
mkPlugin,
...
} @ packageDef: {
# lspsAndRuntimeDeps:
# this section is for dependencies that should be available
# at RUN TIME for plugins. Will be available to PATH within neovim terminal
@@ -27,6 +41,9 @@ in {
ripgrep
fzf
];
notes = with pkgs; [
zk
];
lua = with pkgs; [
lua-language-server
stylua
@@ -45,15 +62,13 @@ in {
go
];
typescript = with pkgs; [
typescript-language-server
vtsls
vscode-langservers-extracted
vue-language-server
stylelint-lsp
tailwindcss-language-server
];
yaml = with pkgs; [
yaml-language-server
gitlab-ci-ls
];
c = with pkgs; [
clang
@@ -90,6 +105,10 @@ in {
# not loaded automatically at startup.
# use with packadd and an autocommand in config to achieve lazy loading
optionalPlugins = {
notes = with pkgs.vimPlugins; [
zk-nvim
render-markdown-nvim
];
go = with pkgs.vimPlugins; [
nvim-dap-go
];
@@ -115,7 +134,7 @@ in {
# shared libraries to be added to LD_LIBRARY_PATH
# variable available to nvim runtime
sharedLibraries = {
general = with pkgs; [ ];
general = with pkgs; [];
};
# environmentVariables:
@@ -140,13 +159,17 @@ in {
# '' --set CATTESTVAR2 "It worked again!"''
# ];
};
});
};
# see :help nixCats.flake.outputs.packageDefinitions
packageDefinitions.replace = {
# These are the names of your packages
# you can include as many as you wish.
nvim = {pkgs, name, ... }: {
nvim = {
pkgs,
name,
...
}: {
# they contain a settings set defined above
# see :help nixCats.flake.outputs.settings
settings = {
@@ -166,6 +189,7 @@ in {
# and a set of categories that you want
categories = {
general = true;
notes = true;
lua = true;
nix = true;
go = true;
@@ -178,7 +202,6 @@ in {
# anything else to pass and grab in lua with `nixCats.extra`
extra = {
nixdExtras.nixpkgs = ''import ${pkgs.path} {}'';
vueExtras.location = "${lib.getBin pkgs.vue-language-server}/lib/node_modules/@vue/language-server";
};
};
};

54
modules/home-manager/nixcats/init.lua
View File

@@ -582,6 +582,39 @@ require('lze').load {
vim.keymap.set("n", "<leader>k", function() harpoon:list():prev() end)
vim.keymap.set("n", "<leader>j", function() harpoon:list():next() end)
end
},
{
"zk-nvim",
enabled = nixCats('notes') or false,
event = "DeferredUIEnter",
after = function ()
require("zk").setup({
picker = "snacks_picker"
})
local opts = { noremap=true, silent=false }
-- Create a new note after asking for its title.
vim.api.nvim_set_keymap("n", "<leader>zn", "<Cmd>ZkNew { title = vim.fn.input('Title: ') }<CR>", opts)
-- Open notes.
vim.api.nvim_set_keymap("n", "<leader>zf", "<Cmd>ZkNotes { sort = { 'modified' } }<CR>", opts)
-- Open notes associated with the selected tags.
vim.api.nvim_set_keymap("n", "<leader>zt", "<Cmd>ZkTags<CR>", opts)
-- Search for the notes matching a given query.
vim.api.nvim_set_keymap("n", "<leader>zg", "<Cmd>ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }<CR>", opts)
-- Search for the notes matching the current visual selection.
vim.api.nvim_set_keymap("v", "<leader>zm", ":'<,'>ZkMatch<CR>", opts)
end
},
{
"render-markdown.nvim",
enabled = nixCats('notes') or false,
ft = "markdown",
after = function ()
require('render-markdown').setup({})
end
}
}
@@ -687,21 +720,9 @@ require('lze').load {
-- also these are regular specs and you can use before and after and all the other normal fields
},
{
"ts_ls",
"vtsls",
enabled = nixCats('typescript') or false,
lsp = {
on_attach = lsp_on_attach,
filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx", "vue" },
init_options = {
plugins = {
{
name = "@vue/typescript-plugin",
languages = { "vue" },
location = nixCats.extra("vueExtras.location"),
},
},
},
},
lsp = {},
},
{
"eslint",
@@ -723,11 +744,6 @@ require('lze').load {
enabled = nixCats('yaml') or false,
lsp = {},
},
{
"gitlab_ci_ls",
enabled = nixCats('yaml') or false,
lsp = {},
},
{
"clangd",
enabled = nixCats('c') or false,

4
modules/home-manager/password-store/default.nix
View File

@@ -26,7 +26,9 @@
services = {
gpg-agent = {
enable = !pkgs.stdenv.isDarwin;
pinentryPackage = pkgs.pinentry-curses;
pinentry = {
package = pkgs.pinentry-curses;
};
};
};
}

5
modules/home-manager/pasystray.nix
View File

@@ -1,7 +1,4 @@
{
pkgs,
...
}: {
{pkgs, ...}: {
services = {
pasystray = {
enable = true;

12
modules/home-manager/stylix.nix
View File

@@ -1,9 +1,9 @@
{
inputs,
pkgs,
config,
lib,
...
inputs,
pkgs,
config,
lib,
...
}: {
imports = [
inputs.stylix.homeModules.stylix
@@ -29,7 +29,7 @@ lib,
};
emoji = {
package = pkgs.noto-fonts-emoji;
package = pkgs.noto-fonts-color-emoji;
name = "Noto Color Emoji";
};
};

8
modules/home-manager/sway.nix
View File

@@ -1,8 +1,8 @@
{
pkgs,
config,
lib,
...
pkgs,
config,
lib,
...
}: {
services.gnome-keyring.enable = true;
wayland.windowManager.sway = {

21
modules/home-manager/zk.nix Normal file
View File

@@ -0,0 +1,21 @@
{
config,
lib,
pkgs,
...
}: {
home.sessionVariables = {
ZK_NOTEBOOK_DIR = "zk";
};
programs = {
zk = {
enable = true;
settings = {
notebook = {
dir = "~/zk";
};
};
};
};
}

2
modules/nixos/docker.nix
View File

@@ -1,4 +1,4 @@
{
virtualisation.docker.enable = true;
users.users.mthomson.extraGroups = [ "docker" ];
users.users.mthomson.extraGroups = ["docker"];
}

4
modules/nixos/emacs/default.nix
View File

@@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.emacs = {
enable = true;
package = pkgs.emacs-unstable;

2
modules/nixos/podman.nix
View File

@@ -10,7 +10,7 @@
containers = {
enable = true;
registries = {
insecure = [ "artifactory.symcor.com" ];
insecure = ["artifactory.symcor.com"];
};
};
};

6
modules/nixos/sway.nix
View File

@@ -1,6 +1,8 @@
{ pkgs, inputs, ... }:
{
pkgs,
inputs,
...
}: {
security.polkit.enable = true;
programs = {