millironx/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

Compare commits

base: millironx:4db28db2139396852764dc0f7f941088ea782360
Branches Tags
millironx:master
millironx:feat/nixos-25.11
millironx:feat/mcentire-crowdsec
..
compare: millironx:a68f3b6bd66df96ea063c48bf256b25b20a9e19d
Branches Tags
millironx:master
millironx:feat/nixos-25.11
millironx:feat/mcentire-crowdsec

No commits in common. "4db28db2139396852764dc0f7f941088ea782360" and "a68f3b6bd66df96ea063c48bf256b25b20a9e19d" have entirely different histories.
4db28db213 ... a68f3b6bd6

10 changed files with 86 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

62
flake.lock generated
View file

@ -55,16 +55,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781981105, "lastModified": 1772985280,
"narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7bfff44b465909f69a442701293bc0badcf476dc", "rev": "8f736f007139d7f70752657dff6a401a585d6cbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-26.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -76,16 +76,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781772065, "lastModified": 1772129556,
"narHash": "sha256-xIbRSwDB1GBAUsWsQZUjudGfAGQt3BOpsWaO/ugVa4w=", "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "adda04f0bf4819575b1978c2f8d78401b3c2be12", "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "owner": "LnL7",
"ref": "nix-darwin-26.05", "ref": "nix-darwin-25.11",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -112,43 +112,43 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1782375420, "lastModified": 1772822230,
"narHash": "sha256-wiPYmEuHbJvleW489n6+lamL7JSJg3pcKUYwURU9CkI=", "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4062d36ebeae843c750011eef6b61ec9a9dbc9a9", "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-26.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1782185013, "lastModified": 1766129819,
"narHash": "sha256-MMIaAyu3HWrWUBTWEGjhSw3CxfAOVfgqdWv4hcx/+Fs=", "narHash": "sha256-crNRwvsbH2XSV8IwBjX6Tm+uWmYwhYyRuNVJ9/ZwlmA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a54db6898b38a6beded82ce6890b46a0a517d72", "rev": "eedcb27bf99430e51f83d896cd1149b828290d20",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixpkgs-26.05-darwin",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eedcb27bf99430e51f83d896cd1149b828290d20",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1782175435, "lastModified": 1772771118,
"narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", "narHash": "sha256-xWzaTvmmACR/SRWtABgI/Z97lcqwJAeoSd5QW1KdK1s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", "rev": "e38213b91d3786389a446dfce4ff5a8aaf6012f2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -166,11 +166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782590177, "lastModified": 1773029295,
"narHash": "sha256-TkFqACbfUwWeD00ROAXNhxI2wflPP2poUOLeeq60bRg=", "narHash": "sha256-xmHhVHbaA5hR3dCEoGwqAgL6HTTJ0KEMRUTLdJuVtGM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "ed5872eecf655379bfe46debce7182956b9ad080", "rev": "bf45b24de2134f1488f7a6c135f4b0420ccec6fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775856943, "lastModified": 1772361940,
"narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", "narHash": "sha256-B1Cz+ydL1iaOnGlwOFld/C8lBECPtzhiy/pP93/CuyY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", "rev": "a4b33606111c9c5dcd10009042bb710307174f51",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +204,11 @@
}, },
"quadlet-nix": { "quadlet-nix": {
"locked": { "locked": {
"lastModified": 1782004439, "lastModified": 1770606362,
"narHash": "sha256-OANOcPKJ3JThp2x/ccz4DDrGDY2hIgM5SBLI51swgfI=", "narHash": "sha256-6pOOPOQr4rtgShBtkLkSDTql5rRqcUgTRz8O+axK2eM=",
"owner": "SEIAROTg", "owner": "SEIAROTg",
"repo": "quadlet-nix", "repo": "quadlet-nix",
"rev": "f1652b490b812c4e0b2a36565cdbedf87f35e438", "rev": "f4ae60350ea6015b6560cbd0e1f11f7e195c993d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -240,11 +240,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1782532968, "lastModified": 1773028978,
"narHash": "sha256-nRE0OA58F9UtlZkAzfggrLfTcXhqvP89pE5CCIgujBk=", "narHash": "sha256-4BjOTYhHP8ljHShQyZ1gUIdwgSLjvaGN2ueKfqp6CQk=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "06aa41fb8e537b83fab322ff2c9444ecc5bbe720", "rev": "a6ed037ffc0b50a9bd0c92e20e31f270a03ca1e3",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

10
flake.nix
View file

@ -3,8 +3,10 @@
inputs = { inputs = {
# Specify the source of Home Manager and Nixpkgs. # Specify the source of Home Manager and Nixpkgs.
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-26.05-darwin"; # Revert to a cached version of Julia for aarch64-darwin
nixpkgs-darwin.url =
"github:nixos/nixpkgs/eedcb27bf99430e51f83d896cd1149b828290d20";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
# Inputs for both darwin and linux systems # Inputs for both darwin and linux systems
@ -17,7 +19,7 @@
}; };
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-26.05"; url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nur = { nur = {
@ -41,7 +43,7 @@
# Darwin-specific inputs # Darwin-specific inputs
nix-darwin = { nix-darwin = {
url = "github:LnL7/nix-darwin/nix-darwin-26.05"; url = "github:LnL7/nix-darwin/nix-darwin-25.11";
inputs.nixpkgs.follows = "nixpkgs-darwin"; inputs.nixpkgs.follows = "nixpkgs-darwin";
}; };
nix-rosetta-builder = { nix-rosetta-builder = {

2
homes/common.nix
View file

@ -32,7 +32,7 @@
most most
p7zip p7zip
pdfgrep pdfgrep
# pipx pipx
python3 python3
]; ];
sessionVariables = { sessionVariables = {

2
homes/desktop.nix
View file

@ -22,7 +22,7 @@
nerd-fonts.symbols-only nerd-fonts.symbols-only
nil nil
nixd nixd
nixfmt nixfmt-classic
nixos-rebuild nixos-rebuild
quarto quarto
roboto-slab roboto-slab

4
homes/linux-desktop.nix
View file

@ -6,7 +6,7 @@ in {
imports = [ ./../programs/plasma.nix ]; imports = [ ./../programs/plasma.nix ];
home = { home = {
packages = with pkgs; [ sqlitebrowser custom-pkgs.sc4pac ]; packages = with pkgs; [ kwalletcli sqlitebrowser custom-pkgs.sc4pac ];
sessionVariables = { ZED_WINDOW_DECORATIONS = "server"; }; sessionVariables = { ZED_WINDOW_DECORATIONS = "server"; };
}; };
services = { services = {
@ -14,7 +14,7 @@ in {
# Use kwallet cli, but put it in extraConfig, otherwise gpg-agent will # Use kwallet cli, but put it in extraConfig, otherwise gpg-agent will
# ask the cli for the password, instead of asking the pinentry package for it # ask the cli for the password, instead of asking the pinentry package for it
extraConfig = '' extraConfig = ''
pinentry-program /usr/bin/pinentry-qt pinentry-program ${pkgs.kwalletcli}/bin/pinentry-kwallet
''; '';
}; };
}; };

3
programs/firefox.nix
View file

@ -1,9 +1,8 @@
{ pkgs, config, firefox-addons, buildFirefoxXpiAddon, lib, ... }: { { pkgs, firefox-addons, buildFirefoxXpiAddon, lib, ... }: {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = package =
null; # Use native package manager/Homebrew b/c there are fewer breakages null; # Use native package manager/Homebrew b/c there are fewer breakages
configPath = "${config.xdg.configHome}/mozilla/firefox";
nativeMessagingHosts = [ ]; nativeMessagingHosts = [ ];
profileVersion = null; profileVersion = null;
profiles = { profiles = {

4
programs/neovim.nix
View file

@ -4,8 +4,6 @@
package = pkgs.neovim-unwrapped; package = pkgs.neovim-unwrapped;
defaultEditor = true; defaultEditor = true;
coc.enable = true; coc.enable = true;
withRuby = false;
withPython3 = false;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
mason-nvim mason-nvim
mason-lspconfig-nvim mason-lspconfig-nvim
@ -18,7 +16,7 @@
lspsaga-nvim lspsaga-nvim
vim-slime vim-slime
]; ];
initLua = '' extraLuaConfig = ''
require("mason").setup() require("mason").setup()
''; '';
}; };

56
programs/ssh.nix
View file

@ -1,57 +1,57 @@
{ pkgs, lib, config, hostname, ... }: { pkgs, lib, config, hostname, ... }:
let let
sshIdPath = host: "~/.ssh/id_ed25519__${host}"; sshIdPath = host: "~/.ssh/id_ed25519__${host}";
tailnetConfig = host: { IdentityFile = sshIdPath host; }; tailnetConfig = host: { identityFile = sshIdPath host; };
gitConfig = host: tailnetConfig host // { User = "git"; }; gitConfig = host: tailnetConfig host // { user = "git"; };
tailnetHosts = [ "anderson" "mcentire" "bosephus" ]; tailnetHosts = [ "anderson" "mcentire" "bosephus" ];
gitHosts = [ "github.com" "gitlab.com" "codeberg.org" "code.millironx.com" ]; gitHosts = [ "github.com" "gitlab.com" "codeberg.org" "code.millironx.com" ];
tailnetMatchBlocks = tailnetMatchBlocks =
lib.genAttrs (lib.lists.remove hostname tailnetHosts) tailnetConfig; lib.genAttrs (lib.lists.remove hostname tailnetHosts) tailnetConfig;
gitMatchBlocks = lib.genAttrs gitHosts gitConfig // { gitMatchBlocks = lib.genAttrs gitHosts gitConfig // {
"code.millironx.com" = (gitConfig "code.millironx.com") // { "code.millironx.com" = (gitConfig "code.millironx.com") // {
ProxyCommand = "ssh anderson -W localhost:2222"; proxyCommand = "ssh anderson -W localhost:2222";
HostName = "code.millironx.com"; hostname = "code.millironx.com";
}; };
}; };
in { in {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
settings = { matchBlocks = {
"*" = { IdentitiesOnly = true; }; "*" = { identitiesOnly = true; };
"aahz" = { "aahz" = {
HostName = "nistac-108-37.dhcp.ksu.edu"; hostname = "nistac-108-37.dhcp.ksu.edu";
User = "tchristensen"; user = "tchristensen";
IdentityFile = sshIdPath "aahz"; identityFile = sshIdPath "aahz";
}; };
"skeeve" = { "skeeve" = {
HostName = "129.130.108.157"; hostname = "129.130.108.157";
User = "tchristensen"; user = "tchristensen";
IdentityFile = sshIdPath "skeeve"; identityFile = sshIdPath "skeeve";
}; };
"ceres" = { "ceres" = {
HostName = "ceres.scinet.usda.gov"; hostname = "ceres.scinet.usda.gov";
User = "thomas.christensen"; user = "thomas.christensen";
IdentitiesOnly = false; identitiesOnly = false;
ServerAliveInterval = 20; serverAliveInterval = 20;
ServerAliveCountMax = 30; serverAliveCountMax = 30;
TCPKeepAlive = "yes"; extraOptions = { TCPKeepAlive = "yes"; };
}; };
"atlas" = { "atlas" = {
HostName = "Atlas-login-1.hpc.msstate.edu"; hostname = "Atlas-login-1.hpc.msstate.edu";
User = "thomas.christensen"; user = "thomas.christensen";
IdentitiesOnly = false; identitiesOnly = false;
ServerAliveInterval = 20; serverAliveInterval = 20;
ServerAliveCountMax = 30; serverAliveCountMax = 30;
TCPKeepAlive = "yes"; extraOptions = { TCPKeepAlive = "yes"; };
}; };
"atlas-dtn" = { "atlas-dtn" = {
HostName = "Atlas-dtn.hpc.msstate.edu"; hostname = "Atlas-dtn.hpc.msstate.edu";
User = "thomas.christensen"; user = "thomas.christensen";
IdentitiesOnly = false; identitiesOnly = false;
}; };
"code.millironx.com" = { "code.millironx.com" = {
ProxyCommand = "ssh anderson -W localhost:2222"; proxyCommand = "ssh anderson -W localhost:2222";
}; };
} // tailnetMatchBlocks // gitMatchBlocks; } // tailnetMatchBlocks // gitMatchBlocks;
}; };

4
programs/zed.nix
View file

@ -65,7 +65,9 @@
}; };
}; };
}; };
Nix = { formatter.external.command = "${pkgs.nixfmt}/bin/nixfmt"; }; Nix = {
formatter.external.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
};
}; };
lsp = { lsp = {
nil = { settings.nix.flake.autoArchive = true; }; nil = { settings.nix.flake.autoArchive = true; };

21
services/jellyfin.nix
View file

@ -1,9 +1,13 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }: let
let driver-name = "iHD"; driver-name = "iHD"; in
in { {
environment = { environment = {
sessionVariables.LIBVA_DRIVER_NAME = driver-name; sessionVariables.LIBVA_DRIVER_NAME = driver-name;
systemPackages = with pkgs; [ jellyfin jellyfin-web jellyfin-ffmpeg ]; systemPackages = with pkgs; [
jellyfin
jellyfin-web
jellyfin-ffmpeg
];
}; };
hardware.graphics = { hardware.graphics = {
@ -11,13 +15,13 @@ in {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-ocl intel-ocl
intel-media-driver intel-media-driver
intel-compute-runtime-legacy1
]; ];
}; };
# Allow the unfree drivers # Allow the unfree drivers
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
builtins.elem (lib.getName pkg) [ "intel-ocl" ]; "intel-ocl"
];
services.jellyfin = { services.jellyfin = {
enable = true; enable = true;
@ -26,6 +30,5 @@ in {
systemd.services.jellyfin.environment.LIBVA_DRIVER_NAME = driver-name; systemd.services.jellyfin.environment.LIBVA_DRIVER_NAME = driver-name;
users.users.${config.services.jellyfin.user}.extraGroups = users.users.${config.services.jellyfin.user}.extraGroups = [ "mixstudios" "render" ];
[ "mixstudios" "render" ];
} }