albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Merge pull request '24.11' (#7) from 24.11 into main

Browse source 
Reviewed-on: #7
This commit is contained in:
albert 2024-12-04 20:42:42 +01:00
commit 60e3f9a88e
11 changed files with 296 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

258
flake.lock
View file

@ -179,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732742778, "lastModified": 1733168902,
"narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=", "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8", "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,22 +254,6 @@
} }
}, },
"flake-compat_5": { "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -367,6 +351,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"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"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -385,7 +387,10 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -397,11 +402,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730302582, "lastModified": 1732021966,
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -478,16 +483,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1733050161,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -500,16 +505,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1733050161,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -556,6 +561,34 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"jovian": { "jovian": {
"inputs": { "inputs": {
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
@ -606,11 +639,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1732450403, "lastModified": 1733055216,
"narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=", "narHash": "sha256-yB2y7tGJxDI/SDQ0D7b6ocRtLTPm93u8ybdIKQGXRDE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "c817444fb8a3042c26be57d8640fb744bc1b516c", "rev": "f67bf0781c69a46bf3a1469f83c98518aa3054c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,11 +660,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730448474, "lastModified": 1733105089,
"narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=", "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e", "rev": "c6b65d946097baf3915dd51373251de98199280d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -707,11 +740,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1732410305, "lastModified": 1733015484,
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -728,11 +761,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732496924, "lastModified": 1733101779,
"narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -743,11 +776,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1733217105,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +808,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1732410305, "lastModified": 1733015484,
"narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -806,11 +839,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1733015953,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -827,11 +860,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1732803609, "lastModified": 1733125169,
"narHash": "sha256-k8N4oGnoVP3W4wH2fEIPOw9oGsoUhSUhJ+Si+j5qMTE=", "narHash": "sha256-OugU1Egr6ThDlzD8LOiDzgeUEEPPLCTMu0Aqvt1l6AE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "790e2744814101364d435eee99fe1d0112abc686", "rev": "7c13b14d3918f2d8775b966ffd1ba531d1462f7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -842,16 +875,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1732749044, "lastModified": 1733120037,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -873,11 +906,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1733015953,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -889,16 +922,16 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1730327045, "lastModified": 1733120037,
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "080166c15633801df010977d9d7474b4a6c549d7", "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -919,22 +952,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
@ -944,30 +961,31 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1732295842, "lastModified": 1733221381,
"narHash": "sha256-kH3532gNJ89+9fNJSedXuMPhUBxtiFLCUH9hIVR3N/Q=", "narHash": "sha256-6y4BxKhPNlsBZStrOLkZR5fUgJ1wMPH0zZiS7/CCLqA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "07f23a60fdd0ea402bb0d0b6c4c9df89fa638c81", "rev": "667b2a5f7a7925fb3247fd3201f4a9e0bcebcd48",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixvim", "repo": "nixvim",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1732805641, "lastModified": 1733231429,
"narHash": "sha256-dt62iVgFbADlCT4j6XgUkwhejWU55kVQG5040HyA/bc=", "narHash": "sha256-2ekVchNHMyTg/YRXLRj3OO3CU5t0HiEQnr27GMUs1uA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5bfc920efdaa5044521000b95409a2594c1f3603", "rev": "5a1c6c849704bbbdfc60289e7107bba4b9995b91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -976,6 +994,29 @@
"type": "github" "type": "github"
} }
}, },
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733006402,
"narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=",
"owner": "NuschtOS",
"repo": "search",
"rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"plasma-manager": { "plasma-manager": {
"inputs": { "inputs": {
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
@ -984,11 +1025,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732639391, "lastModified": 1733005589,
"narHash": "sha256-kFtXjoCIqx9xe0ZryPXpqS6l/HVg71aNcuL8Y5e8+pI=", "narHash": "sha256-NAym0oWYwKgFuAif6Z7HacU6Su/SJNTW4wEYC5urSYU=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "06e3209d11797d9c741e25df06ab61048746bf93", "rev": "88ca377ff58b5c30a2879745829842554d4b21d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1069,11 +1110,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1732575825, "lastModified": 1733128155,
"narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1091,10 +1132,12 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_5",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_4", "home-manager": "home-manager_4",
"nixpkgs": "nixpkgs_7" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1718122552, "lastModified": 1718122552,
@ -1141,6 +1184,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1171,11 +1229,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730321837, "lastModified": 1732894027,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
flake.nix
View file

@ -2,16 +2,17 @@
description = "NixOS System Config"; description = "NixOS System Config";
inputs = { inputs = {
# Stable Packages # Stable Packages
nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs.url = "nixpkgs/nixos-24.11";
# Unstable Packages # Unstable Packages
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
# home-manager - Dotfile mnagement - add /master at the end to pull from master # home-manager - Dotfile mnagement - add /master at the end to pull from master
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Nix colorizer / themer # Nix colorizer / themer
stylix.url = "github:danth/stylix/release-24.05"; stylix.url = "github:danth/stylix/release-24.11";
stylix.inputs.nixpkgs.follows = "nixpkgs";
# nixvim - neovim configuration management in nix # nixvim - neovim configuration management in nix
nixvim.url = "github:nix-community/nixvim/nixos-24.05"; nixvim.url = "github:nix-community/nixvim/nixos-24.11";
# lanzaboote - Secureboot Configuration # lanzaboote - Secureboot Configuration
lanzaboote.url = "github:nix-community/lanzaboote"; lanzaboote.url = "github:nix-community/lanzaboote";
lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
@ -61,7 +62,7 @@
nuc-server = libx.mkHost { hostname = "nuc-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; };
# User Machines # User Machines
nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "plasma6"; theme = "gruvbox"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "plasma6"; };
nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; }; nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; };
steamdeck = libx.mkDeck { hostname = "steamdeck"; desktop = "plasma6"; }; steamdeck = libx.mkDeck { hostname = "steamdeck"; desktop = "plasma6"; };

3
home-manager/common/software/cli/fish.nix
View file

@ -130,6 +130,9 @@
}; };
shellAliases = { shellAliases = {
# Tsilcale helpers
ts-dns-disable ="sudo tailscale set --accept-dns=false";
ts-dns-enable ="sudo tailscale set --accept-dns=true";
# GPG Related # GPG Related
sign = "gpg -u $PGP_KEY_ID --armor --detach-sig"; sign = "gpg -u $PGP_KEY_ID --armor --detach-sig";

7
home-manager/common/software/cli/nixvim.nix
View file

@ -33,9 +33,10 @@
vim.diagnostic.config({ virtual_text = false }) vim.diagnostic.config({ virtual_text = false })
''; '';
diagnostics.virtual_lines.only_current_line = true;
plugins = { plugins = {
lsp-lines.enable = true; lsp-lines.enable = true;
lsp-lines.currentLine = true;
crates-nvim.enable = true; crates-nvim.enable = true;
lspsaga = { lspsaga = {
enable = false; enable = false;
@ -45,7 +46,7 @@
lsp = { lsp = {
enable = true; enable = true;
servers = { servers = {
rust-analyzer = { rust_analyzer = {
enable = true; enable = true;
installCargo = true; installCargo = true;
installRustc = true; installRustc = true;
@ -74,7 +75,7 @@
bashls.enable = false; bashls.enable = false;
tailwindcss.enable = true; tailwindcss.enable = true;
svelte.enable = true; svelte.enable = true;
docker-compose-language-service.enable = true; docker_compose_language_service.enable = true;
marksman.enable = true; marksman.enable = true;
}; };

1
home-manager/common/software/cli/nixvim/alpha.nix
View file

@ -1,7 +1,6 @@
{ ... }: { { ... }: {
programs.nixvim.plugins.alpha = { programs.nixvim.plugins.alpha = {
enable = true; enable = true;
iconsEnabled = true;
layout = layout =
let let

108
home-manager/common/software/cli/nixvim/base.nix
View file

@ -42,6 +42,7 @@
''; '';
plugins = { plugins = {
web-devicons.enable = true;
# Git related # Git related
# Gutter information for git modifications # Gutter information for git modifications
gitsigns.enable = true; gitsigns.enable = true;
@ -58,8 +59,7 @@
# Fancy popups, etc for vim # Fancy popups, etc for vim
noice = { noice = {
enable = true; enable = true;
popupmenu.enabled = false; settings = {
lsp.hover.enabled = false;
presets = { presets = {
bottom_search = true; bottom_search = true;
command_palette = true; command_palette = true;
@ -67,6 +67,9 @@
inc_rename = false; inc_rename = false;
lsp_doc_border = true; lsp_doc_border = true;
}; };
lsp.hover.enabled = false;
popupmenu.enabled = false;
};
}; };
notify = { notify = {
enable = true; enable = true;
@ -89,7 +92,7 @@
# Indentation guides # Indentation guides
indent-blankline.enable = true; indent-blankline.enable = true;
# Surround text blocks # Surround text blocks
surround.enable = true; vim-surround.enable = true;
# Automatic indent # Automatic indent
intellitab.enable = true; intellitab.enable = true;
# Better yank # Better yank
@ -101,6 +104,8 @@
# tab bar like Firefox or Chrome # tab bar like Firefox or Chrome
bufferline = { bufferline = {
enable = true; enable = true;
settings = {
options = {
hover.enabled = true; hover.enabled = true;
separatorStyle = "slant"; separatorStyle = "slant";
offsets = [{ offsets = [{
@ -111,6 +116,8 @@
separator = true; separator = true;
}]; }];
}; };
};
};
# sidebar file browser # sidebar file browser
nvim-tree = { nvim-tree = {
@ -130,11 +137,11 @@
enable = true; enable = true;
settings = { settings = {
auto_close = true; auto_close = true;
cycle_results = false; # cycle_results = false;
height = 14; # height = 14;
win_config = { # win_config = {
border = "rounded"; # border = "rounded";
}; # };
}; };
}; };
@ -211,25 +218,81 @@
# Popup to show shortcuts # Popup to show shortcuts
which-key = { which-key = {
enable = true; enable = true;
window.border = "rounded"; settings.win.border = "rounded";
registrations = { settings.spec = [
"<leader>b" = "Manage buffers..."; # "<leader>b" = "Manage buffers...";
"<leader>c" = "Colorscheme..."; {
"<leader>g" = "Git Options..."; __unkeyed-1 = "<leader>b";
"<leader>l" = "LSP Options..."; group = "Buffers";
"<leader>n" = "NvimTree / Noice..."; icon = "󰓩 ";
"<leader>t" = "Trouble..."; }
"<leader>T" = "ToggleTerm..."; # "<leader>c" = "Colorscheme...";
"<leader>w" = "Manage Windows..."; {
"<leader>wo" = "Open New..."; __unkeyed-1 = "<leader>c";
"<leader>wr" = "Resize..."; group = "Colorschemes";
"<leader>m" = "Multicursor..."; icon = "󰉦 ";
}; }
# "<leader>g" = "Git Options...";
{
__unkeyed-1 = "<leader>g";
group = "Git";
icon = " ";
}
# "<leader>l" = "LSP Options...";
{
__unkeyed-1 = "<leader>l";
group = "LSP";
icon = "" ;
}
# "<leader>n" = "NvimTree / Noice...";
{
__unkeyed-1 = "<leader>n";
group = "NvimTree / Noice";
icon = " ";
}
# "<leader>t" = "Trouble...";
{
__unkeyed-1 = "<leader>t";
group = "Trouble";
icon = " ";
}
# "<leader>T" = "ToggleTerm...";
{
__unkeyed-1 = "<leader>T";
group = "ToggleTerm";
icon = " ";
}
# "<leader>w" = "Manage Windows...";
{
__unkeyed-1 = "<leader>w";
group = "Windows";
icon = " ";
}
# "<leader>wo" = "Open New...";
{
__unkeyed-1 = "<leader>wo";
group = "Open New...";
icon = " ";
}
# "<leader>wr" = "Resize...";
{
__unkeyed-1 = "<leader>wr";
group = "Resize";
icon = "󰩨 ";
}
# "<leader>m" = "Multicursor...";
{
__unkeyed-1 = "<window>m";
group = "Milticursor";
icon = "󰇀 ";
}
];
}; };
# Airline / Powerline alternative # Airline / Powerline alternative
lualine = { lualine = {
enable = true; enable = true;
settings = {
componentSeparators = { componentSeparators = {
right = "«"; right = "«";
left = "»"; left = "»";
@ -239,6 +302,7 @@
left = ""; left = "";
}; };
}; };
};
telescope = { telescope = {
enable = true; enable = true;

8
lib/packages.nix
View file

@ -6,7 +6,9 @@
allowUnfree = unfree; allowUnfree = unfree;
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-27.3.11" # Logseq "electron-27.3.11" # Logseq
"olm-3.2.16" # Unknown # "olm-3.2.16" # Unknown
"dotnet-runtime-wrapped-7.0.20"
"dotnet-runtime-7.0.20"
]; ];
}; };
hostPlatform = system; hostPlatform = system;
@ -18,7 +20,9 @@
allowUnfree = unfree; allowUnfree = unfree;
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-27.3.11" # Logseq "electron-27.3.11" # Logseq
"olm-3.2.16" # Unknown # "olm-3.2.16" # Unknown
"dotnet-runtime-wrapped-7.0.20"
"dotnet-runtime-7.0.20"
]; ];
}; };
hostPlatform = system; hostPlatform = system;

9
nixos/common/modules/fonts.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { { pkgs-unstable, config, ... }: {
# Fonts # Fonts
fonts = { fonts = {
fontconfig = { fontconfig = {
@ -11,8 +11,11 @@
includeUserConf = false; includeUserConf = false;
}; };
packages = with pkgs; [ packages = with pkgs-unstable; [
(nerdfonts.override { fonts = [ "Arimo" "JetBrainsMono" ]; }) # (nerdfonts.override { fonts = [ "Arimo" "JetBrainsMono" ]; })
# nerdfonts
nerd-fonts.jetbrains-mono
nerd-fonts.arimo
# noto-fonts-emoji # noto-fonts-emoji
# sarasa-gothic # sarasa-gothic
font-awesome font-awesome

2
nixos/common/modules/nvidia-535.nix
View file

@ -3,7 +3,7 @@
{ {
# Enable OpenGL # Enable OpenGL
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
}; };

2
nixos/hosts/nixos-desktop/default.nix
View file

@ -50,7 +50,7 @@
}; };
hardware = { hardware = {
opengl = { graphics = {
enable = true; enable = true;
}; };
nvidia = { nvidia = {

4
nixos/hosts/nixos-framework/default.nix
View file

@ -44,10 +44,8 @@
# Set the networking hostname: # Set the networking hostname:
networking.hostName = "nixos-framework"; networking.hostName = "nixos-framework";
hardware = { hardware = {
opengl = { graphics = {
enable = true; enable = true;
driSupport32Bit = true;
driSupport = true;
}; };
}; };