Dotfiles/nixos-dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added my stuff from before, along with the stuff on macbook

Browse Source 
nix flake check passed, so maybe this will work first try?
This commit is contained in:
river
2026-07-12 11:33:28 -05:00
parent c5209b0d90
commit 4f6c1e337d
3 changed files with 506 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+473 -12
View File
@@ -1,6 +1,43 @@
{ {
"nodes": { "nodes": {
"cachix": { "cachix": {
"inputs": {
"devenv": [
"clonee",
"devenv"
],
"flake-compat": [
"clonee",
"devenv",
"flake-compat"
],
"git-hooks": [
"clonee",
"devenv",
"git-hooks"
],
"nixpkgs": [
"clonee",
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1777487137,
"narHash": "sha256-TuvKVBX60mqyMT6OB5JqVEh1YIWtFMR/igLCaCdC9tw=",
"owner": "cachix",
"repo": "cachix",
"rev": "a66a440c321d35f7193472c317f42a55ccd1cb93",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "latest",
"repo": "cachix",
"type": "github"
}
},
"cachix_2": {
"inputs": { "inputs": {
"devenv": [ "devenv": [
"silicate", "silicate",
@@ -37,6 +74,28 @@
"type": "github" "type": "github"
} }
}, },
"clonee": {
"inputs": {
"devenv": "devenv",
"naersk": "naersk",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1783739292,
"narHash": "sha256-4Q15SKZFttcCqnD1MC/qQCqA/L/QqqtN7d9iyMz+ld0=",
"ref": "refs/heads/main",
"rev": "378c1f7c0d1c004d504ad8496d136ec381688f10",
"revCount": 9,
"type": "git",
"url": "https://gitea.maariz.org/pure_sagacity/clonee"
},
"original": {
"type": "git",
"url": "https://gitea.maariz.org/pure_sagacity/clonee"
}
},
"crate2nix": { "crate2nix": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -54,6 +113,23 @@
"type": "github" "type": "github"
} }
}, },
"crate2nix_2": {
"flake": false,
"locked": {
"lastModified": 1772186516,
"narHash": "sha256-8s28pzmQ6TOIUzznwFibtW1CMieMUl1rYJIxoQYor58=",
"owner": "rossng",
"repo": "crate2nix",
"rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
"type": "github"
},
"original": {
"owner": "rossng",
"repo": "crate2nix",
"rev": "ba5dd398e31ee422fbe021767eb83b0650303a6e",
"type": "github"
}
},
"devenv": { "devenv": {
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
@@ -65,11 +141,41 @@
"nix": "nix", "nix": "nix",
"nixd": "nixd", "nixd": "nixd",
"nixpkgs": [ "nixpkgs": [
"silicate", "clonee",
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": {
"lastModified": 1782860656,
"narHash": "sha256-HiSNP0/eEhKGZBWC6kLZVN8I6j6AwVnI4gjeH25+/5k=",
"owner": "cachix",
"repo": "devenv",
"rev": "3f6df48c00d8aa408f0440f2707662aa91a1f033",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"devenv_2": {
"inputs": {
"cachix": "cachix_2",
"crate2nix": "crate2nix_2",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"ghostty": "ghostty_2",
"git-hooks": "git-hooks_2",
"nix": "nix_2",
"nixd": "nixd_2",
"nixpkgs": [
"silicate",
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": { "locked": {
"lastModified": 1783109842, "lastModified": 1783109842,
"narHash": "sha256-Fi7lW+sg1ChduOOQRBCK5JeA1cw4x5wSjIJcppRGGqQ=", "narHash": "sha256-Fi7lW+sg1ChduOOQRBCK5JeA1cw4x5wSjIJcppRGGqQ=",
@@ -104,14 +210,58 @@
"type": "github" "type": "github"
} }
}, },
"fast": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1783830645,
"narHash": "sha256-lEx9RLAYwpUS/SpIlRUiIoThQKwjGOj+jXIlmi6CWxg=",
"owner": "GitanElyon",
"repo": "fast",
"rev": "60fb5b7e1f6343bc1fc9a1e168845b71b142810f",
"type": "github"
},
"original": {
"owner": "GitanElyon",
"repo": "fast",
"type": "github"
}
},
"fenix": { "fenix": {
"inputs": {
"nixpkgs": [
"clonee",
"naersk",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1752475459,
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
"owner": "nix-community",
"repo": "fenix",
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"fenix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"silicate", "silicate",
"naersk", "naersk",
"nixpkgs" "nixpkgs"
], ],
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1752475459, "lastModified": 1752475459,
@@ -143,7 +293,45 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": {
"nixpkgs-lib": [
"clonee",
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1778716662,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"silicate", "silicate",
@@ -165,7 +353,41 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "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"
}
},
"ghostty": { "ghostty": {
"flake": false,
"locked": {
"lastModified": 1779069789,
"narHash": "sha256-ojo+gso45/6CVSuqfSVnlWpQ4d0QeLgwok+v/g3yu0E=",
"owner": "ghostty-org",
"repo": "ghostty",
"rev": "4b7bf0b20e3baf9c1ba10c63f2ad1fd853faea8f",
"type": "github"
},
"original": {
"owner": "ghostty-org",
"repo": "ghostty",
"type": "github"
}
},
"ghostty_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1782866021, "lastModified": 1782866021,
@@ -182,6 +404,34 @@
} }
}, },
"git-hooks": { "git-hooks": {
"inputs": {
"flake-compat": [
"clonee",
"devenv",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"clonee",
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1778507602,
"narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"git-hooks_2": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"silicate", "silicate",
@@ -208,6 +458,29 @@
"type": "github" "type": "github"
} }
}, },
"gitignore": {
"inputs": {
"nixpkgs": [
"clonee",
"devenv",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"herdr": { "herdr": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -251,6 +524,25 @@
"naersk": { "naersk": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1782220280,
"narHash": "sha256-thLTFbp9D5Qknmh8q/v4FRpLGphUSijT3E86cbLYTXo=",
"owner": "nix-community",
"repo": "naersk",
"rev": "9aa07bb0256d300219b30622d2454e85f7f3667e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"naersk_2": {
"inputs": {
"fenix": "fenix_2",
"nixpkgs": [ "nixpkgs": [
"silicate", "silicate",
"nixpkgs" "nixpkgs"
@@ -271,6 +563,52 @@
} }
}, },
"nix": { "nix": {
"inputs": {
"flake-compat": [
"clonee",
"devenv",
"flake-compat"
],
"flake-parts": [
"clonee",
"devenv",
"flake-parts"
],
"git-hooks-nix": [
"clonee",
"devenv",
"git-hooks"
],
"nixpkgs": [
"clonee",
"devenv",
"nixpkgs"
],
"nixpkgs-23-11": [
"clonee",
"devenv"
],
"nixpkgs-regression": [
"clonee",
"devenv"
]
},
"locked": {
"lastModified": 1779748925,
"narHash": "sha256-meIhqGC04O5VXbKSFXSQoOKp+XCq5RMnwAk1Guo0VQo=",
"owner": "cachix",
"repo": "nix",
"rev": "0bc443c8ff235c3547d09327b48aaa2ab98b15f2",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "devenv-2.34",
"repo": "nix",
"type": "github"
}
},
"nix_2": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"silicate", "silicate",
@@ -317,6 +655,34 @@
} }
}, },
"nixd": { "nixd": {
"inputs": {
"flake-parts": [
"clonee",
"devenv",
"flake-parts"
],
"nixpkgs": [
"clonee",
"devenv",
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1778381404,
"narHash": "sha256-FqhdOTA8vyoIpkHhbs2cCT7h6EWM7nsLeOYJc1ifQLE=",
"owner": "nix-community",
"repo": "nixd",
"rev": "e3e45eb76663f522e196b7f0cf34cab201db7779",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixd",
"type": "github"
}
},
"nixd_2": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
"silicate", "silicate",
@@ -328,7 +694,7 @@
"devenv", "devenv",
"nixpkgs" "nixpkgs"
], ],
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1780381423, "lastModified": 1780381423,
@@ -345,6 +711,22 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1752077645,
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1783224372, "lastModified": 1783224372,
"narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=", "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=",
@@ -360,10 +742,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"clonee": "clonee",
"disko": "disko", "disko": "disko",
"fast": "fast",
"herdr": "herdr", "herdr": "herdr",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"silicate": "silicate" "silicate": "silicate"
} }
}, },
@@ -384,7 +768,46 @@
"type": "github" "type": "github"
} }
}, },
"rust-analyzer-src_2": {
"flake": false,
"locked": {
"lastModified": 1752428706,
"narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"clonee",
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1779074409,
"narHash": "sha256-6aXy8Ga41iLVM8ibddFU1O5+wYWcBGNEfZzZuL91eIc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "2a77b5b1dc952f214e8102acdef1622b68515560",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"silicate", "silicate",
@@ -408,8 +831,8 @@
}, },
"silicate": { "silicate": {
"inputs": { "inputs": {
"devenv": "devenv", "devenv": "devenv_2",
"naersk": "naersk", "naersk": "naersk_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@@ -417,18 +840,56 @@
"locked": { "locked": {
"lastModified": 1783234406, "lastModified": 1783234406,
"narHash": "sha256-mtP+W1DYWrzf29HqjsgWECcdxRf6zGtXVvyeyqLhl9E=", "narHash": "sha256-mtP+W1DYWrzf29HqjsgWECcdxRf6zGtXVvyeyqLhl9E=",
"ref": "refs/heads/main", "owner": "pure-sagacity",
"repo": "silicate",
"rev": "63e8d8e8efdb523442b29243cb456ffafd519c18", "rev": "63e8d8e8efdb523442b29243cb456ffafd519c18",
"revCount": 83, "type": "github"
"type": "git",
"url": "https://github.com/pure-sagacity/silicate"
}, },
"original": { "original": {
"type": "git", "owner": "pure-sagacity",
"url": "https://github.com/pure-sagacity/silicate" "repo": "silicate",
"type": "github"
}
},
"systems": {
"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": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"clonee",
"devenv",
"nixd",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"silicate", "silicate",
flake.nix
+14 -4
View File
@@ -12,13 +12,23 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
silicate = { herdr = {
url = "git+https://github.com/pure-sagacity/silicate"; url = "github:ogulcancelik/herdr";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
herdr = { fast = {
url = "github:ogulcancelik/herdr"; url = "github:GitanElyon/fast";
inputs.nixpkgs.follows = "nixpkgs";
};
silicate = {
url = "github:pure-sagacity/silicate";
inputs.nixpkgs.follows = "nixpkgs";
};
clonee = {
url = "git+https://gitea.maariz.org/pure_sagacity/clonee";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
modules/core/config.nix
+19
View File
@@ -1,4 +1,5 @@
{ {
inputs,
config, config,
pkgs, pkgs,
shared, shared,
@@ -6,6 +7,7 @@
}: }:
let let
cfg = config.workstation.core; cfg = config.workstation.core;
system = pkgs.stdenv.hostPlatform.system;
allowRootSSH = if cfg.ssh.permitRootLogin then "yes" else "no"; allowRootSSH = if cfg.ssh.permitRootLogin then "yes" else "no";
in in
{ {
@@ -44,8 +46,25 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gitFull gitFull
neovim neovim
btop
unzip
mpv
wl-clipboard
wireplumber
brightnessctl
pulseaudio
pavucontrol
ghostty
git-credential-manager git-credential-manager
gnupg gnupg
yazi
jujutsu
glow
inputs.silicate.packages.${system}.default
inputs.herdr.packages.${system}.default
inputs.fast.packages.${system}.default
inputs.clonee.packages.${system}.default
]; ];
nix = { nix = {