michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: michael:8cdcc6fbf6959777717184f74d7b611981dcccf9
Branches Tags
michael:main
...
compare: michael:9fc90fc8f3ddb61e31ee986c39ed87f808574e5e
Branches Tags
michael:main

6 Commits
8cdcc6fbf6 ... 9fc90fc8f3

Author SHA1 Message Date
Michael Thomas
9fc90fc8f3 git: add aliases 2025-07-12 16:11:31 -04:00
Michael Thomas
2b58d28364 dev: add .net tools 2025-07-12 16:11:31 -04:00
Michael Thomas
b56a79c1a6 pkgs: add nvf config 2025-07-12 16:11:31 -04:00
Michael Thomas
82458342c7 upgrade to nixos 25.05 2025-07-12 16:11:31 -04:00
Michael Thomas
ccf8c75036 treewide: switch from nix to lix 2025-07-12 16:11:31 -04:00
Michael Thomas
cfd60401fc machines(mac): switch to custom spotify & neovim modules 2025-07-12 16:11:31 -04:00
14 changed files with 609 additions and 200 deletions
Show Stats Expand all files Collapse all files

2
common/spotify/default.nix
View File

@ -31,7 +31,7 @@ in {
keyboardShortcut keyboardShortcut
]; ];
theme = spicePkgs.themes.text; theme = spicePkgs.themes.text;
colorScheme = "gruvbox"; colorScheme = "Gruvbox";
}; };
} }
); );

2
common/zsh/home.nix
View File

@ -22,7 +22,7 @@ in {
enableCompletion = true; enableCompletion = true;
# Enable pure prompt # Enable pure prompt
initExtra = '' initContent = ''
fpath+=${pkgs.pure-prompt}/share/zsh/site-functions fpath+=${pkgs.pure-prompt}/share/zsh/site-functions
autoload -U promptinit; autoload -U promptinit;
promptinit promptinit

2
darwin/default.nix
View File

@ -14,5 +14,7 @@
hm.imports = [./home.nix]; hm.imports = [./home.nix];
system.primaryUser = "michael";
environment.systemPackages = [inputs'.agenix.packages.default]; environment.systemPackages = [inputs'.agenix.packages.default];
} }

456
flake.lock generated
View File

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1745630506, "lastModified": 1750173260,
"narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "96e078c646b711aee04b82ba01aefbff87004ded", "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,50 +23,6 @@
"type": "github" "type": "github"
} }
}, },
"ags": {
"inputs": {
"astal": "astal",
"nixpkgs": [
"hyprpanel",
"nixpkgs"
]
},
"locked": {
"lastModified": 1736090999,
"narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=",
"owner": "aylur",
"repo": "ags",
"rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "ags",
"type": "github"
}
},
"astal": {
"inputs": {
"nixpkgs": [
"hyprpanel",
"ags",
"nixpkgs"
]
},
"locked": {
"lastModified": 1735172721,
"narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=",
"owner": "aylur",
"repo": "astal",
"rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "astal",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -96,16 +52,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743127615, "lastModified": 1749744770,
"narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=", "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c", "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lnl7", "owner": "lnl7",
"ref": "nix-darwin-24.11", "ref": "nix-darwin-25.05",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -113,11 +69,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733328505, "lastModified": 1747046372,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +87,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1743550720, "lastModified": 1751413152,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5", "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,11 +108,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743550720, "lastModified": 1751413152,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5", "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,6 +142,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nvf",
"nixpkgs"
]
},
"locked": {
"lastModified": 1749398372,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -222,6 +199,60 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": [
"nvf",
"systems"
]
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -250,41 +281,20 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746171682, "lastModified": 1752208517,
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "50eee705bbdbac942074a8c120e8194185633675", "rev": "c6a01e54af81b381695db796a43360bf6db5702f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "rycee", "owner": "rycee",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"hyprpanel": {
"inputs": {
"ags": "ags",
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1745885816,
"narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=",
"owner": "jas-singhfsu",
"repo": "hyprpanel",
"rev": "0c82ce9704c8063be8d8f60443071c91943eb68c",
"type": "github"
},
"original": {
"owner": "jas-singhfsu",
"repo": "hyprpanel",
"type": "github"
}
},
"ixx": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -299,27 +309,62 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737371634, "lastModified": 1748294338,
"narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "ixx", "repo": "ixx",
"rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "NuschtOS",
"ref": "v0.0.7", "ref": "v0.0.8",
"repo": "ixx", "repo": "ixx",
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1746827285,
"narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746838955,
"narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
}
},
"master": { "master": {
"locked": { "locked": {
"lastModified": 1746825093, "lastModified": 1752279991,
"narHash": "sha256-LAJzhgg1nKvyEGWvg4HGM6zlLJ1b+g34Z5IpEXcgRS8=", "narHash": "sha256-S/4OLxUqFcT9BaXlLWnX8JzN9HdJYuAV3n3C+vihpFA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "710e189c6e3d4a8d04fd040b70353819c541080a", "rev": "6c186a90523d9ce6128beb9351c590d6b4aeb7e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -328,17 +373,32 @@
"type": "github" "type": "github"
} }
}, },
"mnw": {
"locked": {
"lastModified": 1748710831,
"narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "mnw",
"type": "github"
}
},
"nix-vscode-extensions": { "nix-vscode-extensions": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1746755975, "lastModified": 1752200230,
"narHash": "sha256-4YQ/jq1vZrjngu0DDJmYaJW7Jh4IEPiHvrLvlBkvWmk=", "narHash": "sha256-WqqWjRX4qZYqO/cgvU/ZEzJBQqHBi17OEVv2kt05WiU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "6e320439558ef494b83d6407b0c6f2218e47522a", "rev": "3c866dfb70d282247452742098d315b97df713d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,11 +413,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1746453552, "lastModified": 1752199438,
"narHash": "sha256-r66UGha+7KVHkI7ksrcMjnw/mm9Sg4l5bQlylxHwdGU=", "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "be618645aa0adf461f778500172b6896d5ab2d01", "rev": "d34d9412556d3a896e294534ccd25f53b6822e80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +445,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1743296961, "lastModified": 1751159883,
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa", "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,42 +460,42 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1742937945, "lastModified": 1751792365,
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1746557022, "lastModified": 1751943650,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1746663147, "lastModified": 1751984180,
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,6 +506,22 @@
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": {
"lastModified": 1750215678,
"narHash": "sha256-Rc/ytpamXRf6z8UA2SGa4aaWxUXRbX2MAWIu2C8M+ok=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5395fb3ab3f97b9b7abca147249fa2e8ed27b192",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1744536153,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@ -461,13 +537,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1745377448, "lastModified": 1747958103,
"narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -483,14 +559,15 @@
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
], ],
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch",
"systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1746822201, "lastModified": 1752262661,
"narHash": "sha256-XAt4FgViCT9kcSkODQUcbQ8JejjjbTGcMVGIP+7o7YE=", "narHash": "sha256-jPDiaHsKZeFH+zoxRIW0t1T/R+S8cYM3/9YUfMMjUEA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "1b1e43a36e4f701fb2fc870c322373579936f739", "rev": "658980fb247e2f10fa692bae372ac21389a67c6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,15 +579,14 @@
"nur": { "nur": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4"
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746819918, "lastModified": 1752274809,
"narHash": "sha256-ONwwPLlsoIuTN3NLFCVL9eAr9yFyweMurxXZ6R97Lxw=", "narHash": "sha256-EIpOaZoPeC+5PSeaU2UgAqgdkQ70R53W4UkabW0c94o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1470795ec7d4bdd9d0bd5b9f83e403fe858294ad", "rev": "4fd103b49d2f1d3cd956adb3591093bc49c4b647",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,7 +597,7 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -529,11 +605,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745046075, "lastModified": 1749730855,
"narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "066afe8643274470f4a294442aadd988356a478f", "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -542,22 +618,45 @@
"type": "github" "type": "github"
} }
}, },
"nvf": {
"inputs": {
"flake-parts": "flake-parts_4",
"flake-utils": "flake-utils_4",
"mnw": "mnw",
"nixpkgs": "nixpkgs_5",
"systems": "systems_6"
},
"locked": {
"lastModified": 1752180730,
"narHash": "sha256-aSmib/P5DWXrpOdwFOo+lxuupUlNTGUDsLVSxJwWfUg=",
"owner": "notashelf",
"repo": "nvf",
"rev": "8ea010d7e3bf00c2a1f24d52da88afaed87d96f5",
"type": "github"
},
"original": {
"owner": "notashelf",
"repo": "nvf",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"darwin": "darwin_2", "darwin": "darwin_2",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprpanel": "hyprpanel", "lix-module": "lix-module",
"master": "master", "master": "master",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"nvf": "nvf",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"spicetify": "spicetify", "spicetify": "spicetify",
"treefmt-nix": "treefmt-nix_2", "treefmt-nix": "treefmt-nix",
"unstable": "unstable", "unstable": "unstable",
"utils": "utils", "utils": "utils",
"zen-browser": "zen-browser" "zen-browser": "zen-browser"
@ -565,14 +664,14 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1746758179, "lastModified": 1752201818,
"narHash": "sha256-JECUw1YBEsTsVauvupRzE5ykZaJoyhHCpoY87ZZJGas=", "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4fd00513eac6b6140c5dced3e1b8133e2369a0f8", "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,19 +685,18 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_4" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1743595372, "lastModified": 1751776600,
"narHash": "sha256-e3x1mhpPpYgyyin9j/VbrBpOT5PFpEfx2hkxVZuJZhg=", "narHash": "sha256-75wd/aSvSoXUVd/buwI+Gsqx6LdmBVMbdXw+tCV1u58=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "543f12dd14c62ddee79ab79fbfd8726f312b89ff", "rev": "54fad36eeae085f4a6ce4522bc351705b9c0c58a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Gerg-L", "owner": "Gerg-L",
"ref": "24.11",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"type": "github" "type": "github"
} }
@ -678,37 +776,61 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix": { "systems_6": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1733222881, "lastModified": 1681028828,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "numtide", "owner": "nix-systems",
"repo": "treefmt-nix", "repo": "default",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "nix-systems",
"repo": "treefmt-nix", "repo": "default",
"type": "github" "type": "github"
} }
}, },
"treefmt-nix_2": { "systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1746216483, "lastModified": 1752055615,
"narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +841,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1746663147, "lastModified": 1751984180,
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -734,7 +856,7 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -757,11 +879,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746763614, "lastModified": 1752120791,
"narHash": "sha256-tfBsztz6aUcfIFK8Sewn44mkMXZs8rRQfmHBjVhkUBM=", "narHash": "sha256-Tf5qZ6kGwBFyVsnAgkX/uTg0210JWb/GB4XUz15n9WU=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "154aa27229783bca87c3ea3ac4ef32ab9b99cdb6", "rev": "5dbf3f7b62f638ed1e137c32930918c01689c817",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View File

@ -2,22 +2,26 @@
description = "Michael Thomas's NixOS configuration"; description = "Michael Thomas's NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs.url = "nixpkgs/nixos-25.05";
unstable.url = "nixpkgs/nixos-unstable"; unstable.url = "nixpkgs/nixos-unstable";
master.url = "github:NixOS/nixpkgs"; master.url = "github:NixOS/nixpkgs";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
home-manager = { home-manager = {
url = "github:rycee/home-manager/release-24.11"; url = "github:rycee/home-manager/release-25.05";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
}; };
}; };
darwin = { darwin = {
url = "github:lnl7/nix-darwin/nix-darwin-24.11"; url = "github:lnl7/nix-darwin/nix-darwin-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
};
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
@ -26,8 +30,9 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
nvf.url = "github:notashelf/nvf";
spicetify = { spicetify = {
url = "github:Gerg-L/spicetify-nix/24.11"; url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser = { zen-browser = {
@ -36,10 +41,6 @@
}; };
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
hyprpanel = {
url = "github:jas-singhfsu/hyprpanel";
inputs.nixpkgs.follows = "unstable";
};
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";

16
machines/mac/configuration.nix
View File

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
config,
pkgs,
...
}: {
users.users.michael = { users.users.michael = {
home = "/Users/michael"; home = "/Users/michael";
shell = pkgs.zsh; shell = pkgs.zsh;
@ -26,8 +22,6 @@
unstable.docker-compose unstable.docker-compose
# Video # Video
ffmpeg ffmpeg
# Spotify
master.spicetify-cli
# Java # Java
checkstyle checkstyle
# XCode # XCode
@ -39,7 +33,9 @@
my = { my = {
aerospace.enable = true; aerospace.enable = true;
neovim.enable = true;
sketchybar.enable = true; sketchybar.enable = true;
spotify.enable = true;
}; };
programs = { programs = {
@ -55,11 +51,7 @@
}; };
}; };
security.pam.enableSudoTouchIdAuth = true; security.pam.services.sudo_local.touchIdAuth = true;
services = {
nix-daemon.enable = true;
};
system = { system = {
# Since it's not possible to declare default shell, run this command after build # Since it's not possible to declare default shell, run this command after build

2
nixos/hyprland/home.nix
View File

@ -8,8 +8,6 @@
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
cfg = config.my.hyprland; cfg = config.my.hyprland;
in { in {
imports = [inputs.hyprpanel.homeManagerModules.hyprpanel];
options.my.hyprland = { options.my.hyprland = {
enable = mkEnableOption "hyprland"; enable = mkEnableOption "hyprland";
}; };

2
overlays/default.nix
View File

@ -33,7 +33,7 @@
# External overlays # External overlays
# Included after the above to ensure modifications are applied # Included after the above to ensure modifications are applied
hyprpanel = inputs.hyprpanel.overlay; lix = inputs.lix-module.overlays.default;
rust-overlay = inputs.rust-overlay.overlays.default; rust-overlay = inputs.rust-overlay.overlays.default;
vscode-extensions = inputs.nix-vscode-extensions.overlays.default; vscode-extensions = inputs.nix-vscode-extensions.overlays.default;

1
pkgs/default.nix
View File

@ -2,5 +2,6 @@
homer = pkgs.callPackage ./homer {}; homer = pkgs.callPackage ./homer {};
keycloak-theme-keywind = pkgs.callPackage ./keywind {}; keycloak-theme-keywind = pkgs.callPackage ./keywind {};
nvim-custom = import ./nvim/default.nix args; nvim-custom = import ./nvim/default.nix args;
nvim-nvf = import ./nvf/default.nix args;
sbarlua = pkgs.callPackage ./sbarlua {}; sbarlua = pkgs.callPackage ./sbarlua {};
} }

263
pkgs/nvf/config.nix Normal file
View File

@ -0,0 +1,263 @@
{lib, ...}: let
inherit (lib.nvim.binds) mkKeymap;
theme = "gruvbox";
in {
config.vim = {
viAlias = true;
vimAlias = true;
debugMode = {
enable = false;
level = 16;
logFile = "/tmp/nvim.log";
};
# Keymaps for built-in functionality
keymaps = [
# Diagnostics
(mkKeymap "n" "<leader>cd" "vim.diagnostic.open_float" {desc = "Line Diagnostics";})
];
spellcheck = {
enable = true;
};
lsp = {
# This must be enabled for the language modules to hook into
# the LSP API.
enable = true;
formatOnSave = true;
lspkind.enable = false;
lightbulb.enable = true;
# lspsaga.enable = false;
trouble.enable = true;
lspSignature.enable = true; # conflicts with blink
# # otter-nvim.enable = isMaximal;
# # nvim-docs-view.enable = isMaximal;
};
debugger = {
nvim-dap = {
enable = true;
ui.enable = true;
};
};
# This section does not include a comprehensive list of available language modules.
# To list all available language module options, please visit the nvf manual.
languages = {
enableFormat = true; #
enableTreesitter = true;
enableExtraDiagnostics = true;
astro.enable = true;
bash.enable = true;
clang.enable = true;
# csharp.enable = true;
css.enable = true;
gleam.enable = true;
go.enable = true;
html.enable = true;
java.enable = true;
kotlin.enable = true;
lua.enable = true;
markdown.enable = true;
nix.enable = true;
nu.enable = true;
python.enable = true;
r.enable = true;
rust = {
enable = true;
crates.enable = true;
};
sql.enable = true;
svelte.enable = true;
tailwind.enable = true;
ts.enable = true;
typst.enable = true;
zig.enable = true;
};
visuals = {
nvim-scrollbar.enable = true;
nvim-web-devicons.enable = true;
nvim-cursorline.enable = true;
cinnamon-nvim.enable = true;
fidget-nvim.enable = true;
highlight-undo.enable = true;
indent-blankline.enable = true;
# Fun
cellular-automaton.enable = false;
};
statusline = {
lualine = {
enable = true;
inherit theme;
};
};
theme = {
enable = true;
name = theme;
style = "dark";
transparent = false;
};
autopairs.nvim-autopairs.enable = true;
# nvf provides various autocomplete options. The tried and tested nvim-cmp
# is enabled in default package, because it does not trigger a build. We
# enable blink-cmp in maximal because it needs to build its rust fuzzy
# matcher library.
autocomplete = {
# nvim-cmp.enable = !isMaximal;
# # blink-cmp.enable = isMaximal;
};
snippets.luasnip.enable = true;
filetree = {
neo-tree = {
enable = true;
};
};
tabline = {
nvimBufferline.enable = true;
};
treesitter.context.enable = true;
binds = {
whichKey.enable = true;
cheatsheet.enable = true;
# hardtime-nvim.enable = isMaximal;
};
telescope = {
enable = true;
mappings = {
findFiles = "<leader><leader>";
liveGrep = "<leader>/";
lspDefinitions = "<leader>gd";
lspReferences = "<leader>gr";
lspImplementations = "<leader>gI";
lspTypeDefinitions = "<leader>gt";
};
};
git = {
enable = true;
gitsigns.enable = true;
gitsigns.codeActions.enable = false; # throws an annoying debug message
};
minimap = {
minimap-vim.enable = false;
# codewindow.enable = isMaximal; # lighter, faster, and uses lua for configuration
};
dashboard = {
dashboard-nvim.enable = false;
alpha.enable = true;
};
notify = {
nvim-notify.enable = true;
};
projects = {
# project-nvim.enable = isMaximal;
};
utility = {
ccc.enable = false;
vim-wakatime.enable = false;
diffview-nvim.enable = true;
yanky-nvim.enable = false;
# icon-picker.enable = isMaximal;
# surround.enable = isMaximal;
# leetcode-nvim.enable = isMaximal;
# multicursors.enable = isMaximal;
motion = {
hop.enable = true;
leap.enable = true;
# precognition.enable = isMaximal;
};
images = {
image-nvim.enable = false;
# img-clip.enable = isMaximal;
};
};
notes = {
# obsidian.enable = false;
# neorg.enable = false;
# orgmode.enable = false;
# mind-nvim.enable = isMaximal;
todo-comments.enable = true;
};
terminal = {
toggleterm = {
enable = true;
lazygit.enable = true;
mappings = {
open = "<c-/>";
};
};
};
ui = {
borders.enable = true;
noice.enable = true;
colorizer.enable = true;
modes-nvim.enable = false; # the theme looks terrible with catppuccin
illuminate.enable = true;
breadcrumbs = {
# enable = isMaximal;
# navbuddy.enable = isMaximal;
};
smartcolumn = {
enable = true;
setupOpts.custom_colorcolumn = {
# this is a freeform module, it's `buftype = int;` for configuring column position
nix = "110";
ruby = "120";
java = "130";
go = ["90" "130"];
};
};
fastaction.enable = true;
};
# assistant = {
# chatgpt.enable = false;
# copilot = {
# enable = false;
# # cmp.enable = isMaximal;
# };
# codecompanion-nvim.enable = false;
# };
session = {
nvim-session-manager.enable = false;
};
gestures = {
gesture-nvim.enable = false;
};
comments = {
comment-nvim.enable = true;
};
presence = {
neocord.enable = false;
};
};
}

25
pkgs/nvf/default.nix Normal file
View File

@ -0,0 +1,25 @@
{
inputs,
pkgs,
...
}:
(inputs.nvf.lib.neovimConfiguration {
pkgs = pkgs.unstable;
modules = [
(import ./config.nix)
# {
# config.vim = {
# # Enable custom theming options
# theme.enable = true;
#
# # Enable Treesitter
# treesitter.enable = true;
#
# # Other options will go here. Refer to the config
# # reference in Appendix B of the nvf manual.
# # ...
# };
# }
];
})
.neovim

13
user/modules/dev.nix
View File

@ -19,7 +19,6 @@
# Python # Python
python3 python3
# Nix # Nix
unstable.nixd
alejandra alejandra
# Rust # Rust
(rust-bin.stable.latest.default.override { (rust-bin.stable.latest.default.override {
@ -27,20 +26,22 @@
}) })
pkg-config pkg-config
openssl openssl
# .NET
dotnetCorePackages.dotnet_8.sdk
dotnetCorePackages.dotnet_8.aspnetcore
powershell
# Markdown # Markdown
pandoc pandoc
] ]
++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv
++ lib.optionals pkgs.stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
CoreFoundation apple-sdk
CoreServices
SystemConfiguration
]); ]);
# Required for the `openssl-sys` crate to build properly # Required for the `openssl-sys` crate to build properly
home.sessionVariables.PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; home.sessionVariables.PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
programs.zsh.initExtra = '' programs.zsh.initContent = ''
export PATH=~/.npm-packages/bin:$PATH export PATH=~/.npm-packages/bin:$PATH
export NODE_PATH=~/.npm-packages/lib/node_modules export NODE_PATH=~/.npm-packages/lib/node_modules
''; '';

6
user/modules/git.nix
View File

@ -8,7 +8,11 @@
lazygit lazygit
]; ];
home.shellAliases.lg = "lazygit"; home.shellAliases = {
gs = "git status";
ga = "git add";
lg = "lazygit";
};
# Use pkgs.gitAndTools.gitFull in order to get libsecret support # Use pkgs.gitAndTools.gitFull in order to get libsecret support
programs.git = { programs.git = {

2
user/modules/vscode.nix
View File

@ -33,7 +33,7 @@ in {
vscode = { vscode = {
enable = true; enable = true;
inherit package; inherit package;
extensions = with pkgs.open-vsx; [ profiles.default.extensions = with pkgs.open-vsx; [
# Editor # Editor
vscodevim.vim vscodevim.vim
pkgs.vscode-marketplace.miguelsolorio.min-theme pkgs.vscode-marketplace.miguelsolorio.min-theme