Compare commits
No commits in common. "c770b825a8bed85fbf9ffd9f9f406acff29ba45c" and "aea9ebc16ac2bb15b6c05b10f5f05f0e9b0bbe8d" have entirely different histories.
c770b825a8
...
aea9ebc16a
9 changed files with 120 additions and 224 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,3 +0,0 @@
|
|||
.direnv
|
||||
tmp
|
||||
result
|
||||
162
flake.lock
162
flake.lock
|
|
@ -386,17 +386,18 @@
|
|||
},
|
||||
"devshell_4": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722113426,
|
||||
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
|
||||
"lastModified": 1717408969,
|
||||
"narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
|
||||
"rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -551,11 +552,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -572,11 +573,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -698,11 +699,11 @@
|
|||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1701680307,
|
||||
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -759,11 +760,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723202784,
|
||||
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
|
||||
"lastModified": 1720524665,
|
||||
"narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "c7012d0c18567c889b948781bc74a501e92275d1",
|
||||
"rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -890,11 +891,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723399884,
|
||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||
"lastModified": 1721135958,
|
||||
"narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||
"rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -912,11 +913,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723399884,
|
||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||
"lastModified": 1720734513,
|
||||
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -987,18 +988,16 @@
|
|||
"flake-parts": "flake-parts_4",
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite": "xwayland-satellite"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723502033,
|
||||
"narHash": "sha256-uMOSuLducJgrA/ICVetGkchol2IrD1L73F3DqO/73io=",
|
||||
"lastModified": 1721168270,
|
||||
"narHash": "sha256-wmFlWj5d8XcgDksIrWohKsGxiidr6YsI4qLVpDtK95U=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "0d15bcb3d07a5983377a6377582ca8f07e2f94e3",
|
||||
"rev": "e59130f4e446a0161ac75ce031760deec6f7c5ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1027,11 +1026,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722525977,
|
||||
"narHash": "sha256-/ovhGba5HJUn8a54pd428F4fwe/1iXRVPt0TcyoY90w=",
|
||||
"lastModified": 1721114523,
|
||||
"narHash": "sha256-HXUNwB2qeTNmTGX7z8JvyJAKJcDWGRsneaisSW9U1MA=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "908c8eb42af7a24b3fe7961b9d52c104910edcf7",
|
||||
"rev": "3ace97660fde7fe1f0cc07a3925d1114af9a9c2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1048,11 +1047,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722924007,
|
||||
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
||||
"lastModified": 1720845312,
|
||||
"narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
||||
"rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1127,23 +1126,23 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"lastModified": 1719876945,
|
||||
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1722791413,
|
||||
"narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=",
|
||||
"lastModified": 1720954236,
|
||||
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c",
|
||||
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1155,11 +1154,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1721524707,
|
||||
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
|
||||
"lastModified": 1720915306,
|
||||
"narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
|
||||
"rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1243,11 +1242,27 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1723362943,
|
||||
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
|
||||
"lastModified": 1720957393,
|
||||
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
|
||||
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1720957393,
|
||||
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1267,15 +1282,14 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723481641,
|
||||
"narHash": "sha256-9djT72/Ab2E3SpUbB3l0WmqZQ5mj05+LIVoorcjCWgE=",
|
||||
"lastModified": 1721224205,
|
||||
"narHash": "sha256-W0+l7HNzZfEmIx/1Yp3Tow/GZILVjrMjWfTt1Mos7mI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "dbf6f7bc997dc3a9ab1f014ea075600357226950",
|
||||
"rev": "55bda0cc3b230255d271e5eef82f3279dae9f859",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1284,28 +1298,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723367906,
|
||||
"narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
|
|
@ -1420,7 +1412,7 @@
|
|||
"home-manager": "home-manager",
|
||||
"lix-module": "lix-module",
|
||||
"niri": "niri",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixvim": "nixvim",
|
||||
"sops-nix": "sops-nix",
|
||||
"stylix": "stylix"
|
||||
|
|
@ -1434,11 +1426,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723501126,
|
||||
"narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
|
||||
"lastModified": 1720926522,
|
||||
"narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
|
||||
"rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1464,11 +1456,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722946882,
|
||||
"narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
|
||||
"lastModified": 1720818679,
|
||||
"narHash": "sha256-u9PqY7O6TN42SLeb0e6mnYAgQOoQmclaVSHfLKMpmu0=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
|
||||
"rev": "29148118cc33f08b71058e1cda7ca017f5300b51",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1590,11 +1582,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723454642,
|
||||
"narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
|
||||
"lastModified": 1720818892,
|
||||
"narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "349de7bc435bdff37785c2466f054ed1766173be",
|
||||
"rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1606,11 +1598,11 @@
|
|||
"xwayland-satellite": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1721687061,
|
||||
"narHash": "sha256-zk62B0tIf2SRNCeQnXxatq2gvjtaJ8xp3Hp9RB43xs0=",
|
||||
"lastModified": 1721167978,
|
||||
"narHash": "sha256-0sFfLanX66bDSbIiGZP63hFiYg7pmH6ykR7wYSJ1IAk=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "8892570093948de16a50e06b1a7d6890405de7a1",
|
||||
"rev": "054af2a1f7d2785baa25e2eb4de51d88226bed23",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
53
flake.nix
53
flake.nix
|
|
@ -1,41 +1,31 @@
|
|||
{
|
||||
description = "muhh configs for all nix managed things";
|
||||
description = "Home Manager configuration of muhh";
|
||||
|
||||
inputs = {
|
||||
# nixpkgs.url = "nixpkgs/release-24.05";
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
# hardware.url = "nixos/nixos-hardware";
|
||||
|
||||
home-manager = {
|
||||
# url = "github:nix-community/home-manager/release-24.05";
|
||||
# url = "github:nix-community/home-manager/release-23.11";
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
stylix = {
|
||||
url = "github:danth/stylix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
stylix = {
|
||||
url = "github:danth/stylix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
niri = {
|
||||
url = "github:sodiboo/niri-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -43,10 +33,10 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
lix-module,
|
||||
nixvim,
|
||||
sops-nix,
|
||||
stylix,
|
||||
nixvim,
|
||||
lix-module,
|
||||
niri,
|
||||
...
|
||||
} @ inputs: let
|
||||
|
|
@ -68,12 +58,11 @@
|
|||
muhhStar = lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
sops-nix.nixosModules.sops
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
./hosts/muhhStar.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
homeConfigurations = {
|
||||
muhh = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = import nixpkgs {
|
||||
|
|
@ -84,10 +73,10 @@
|
|||
];
|
||||
};
|
||||
modules = [
|
||||
nixvim.homeManagerModules.nixvim
|
||||
sops-nix.homeManagerModules.sops
|
||||
stylix.homeManagerModules.stylix
|
||||
niri.homeModules.niri
|
||||
inputs.nixvim.homeManagerModules.nixvim
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.stylix.homeManagerModules.stylix
|
||||
inputs.niri.homeModules.niri
|
||||
./home.nix
|
||||
];
|
||||
};
|
||||
|
|
|
|||
12
home.nix
12
home.nix
|
|
@ -23,14 +23,12 @@
|
|||
_1password-gui
|
||||
atkinson-hyperlegible
|
||||
alacritty
|
||||
blueman
|
||||
brightnessctl
|
||||
curl
|
||||
darktable
|
||||
ddcutil
|
||||
distrobox
|
||||
dog
|
||||
downonspot
|
||||
fd
|
||||
ffmpegthumbnailer
|
||||
fuzzel
|
||||
|
|
@ -38,7 +36,6 @@
|
|||
htop
|
||||
httpie
|
||||
just
|
||||
libreoffice
|
||||
neovide
|
||||
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
||||
maid
|
||||
|
|
@ -46,16 +43,13 @@
|
|||
mpv
|
||||
morgen
|
||||
obsidian
|
||||
pamixer
|
||||
pavucontrol
|
||||
powertop
|
||||
qutebrowser
|
||||
rclone
|
||||
rockbox-utility
|
||||
signal-desktop
|
||||
solargraph
|
||||
sops
|
||||
spot
|
||||
sxiv
|
||||
steam-run
|
||||
tmux
|
||||
|
|
@ -68,7 +62,6 @@
|
|||
sway-launcher-desktop
|
||||
swaynotificationcenter
|
||||
swayosd
|
||||
vivaldi
|
||||
xdg-utils
|
||||
zellij
|
||||
zulip
|
||||
|
|
@ -353,9 +346,7 @@
|
|||
toggleterm.enable = true;
|
||||
treesitter = {
|
||||
enable = true;
|
||||
settings = {
|
||||
indent.enable = true;
|
||||
};
|
||||
indent = true;
|
||||
};
|
||||
};
|
||||
extraPlugins = with pkgs.vimPlugins; [
|
||||
|
|
@ -620,7 +611,6 @@
|
|||
"XF86AudioPlay" = "exec playerctl play-pause";
|
||||
"XF86AudioNext" = "exec playerctl next";
|
||||
"XF86AudioPrev" = "exec playerctl previous";
|
||||
"${modifier}+o" = "for_window [class=obsidian] scratchpad show";
|
||||
};
|
||||
menu = "kitty --app-id launcher -e sway-launcher-desktop";
|
||||
modifier = "Mod4";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
|
|
@ -20,23 +20,23 @@
|
|||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/f0a69b93-3fdc-48ad-a288-a12ce1e3a205";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/0428-C12E";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/storage/family" =
|
||||
{ device = "/dev/disk/by-uuid/896c11dc-d275-4992-99e6-fddc394a7bf1";
|
||||
fsType = "xfs";
|
||||
};
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/storage/muhh" =
|
||||
{ device = "/dev/disk/by-uuid/8b716713-359b-4bac-8951-a35405dccd4c";
|
||||
fsType = "xfs";
|
||||
};
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
|
@ -49,17 +49,6 @@
|
|||
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware = {
|
||||
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
i2c.enable = true;
|
||||
bluetooth = {
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
settings = {
|
||||
General = {
|
||||
Enable = "Source,Sink,Media,Socket";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.i2c.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
imports =
|
||||
[
|
||||
./cube-hardware-configuration.nix
|
||||
./common.nix
|
||||
../modules/common.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
|
|
@ -50,7 +50,6 @@
|
|||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
# jack.enable = true;
|
||||
};
|
||||
|
|
@ -92,6 +91,8 @@
|
|||
};
|
||||
|
||||
environment.shells = with pkgs; [ bash fish zsh ];
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
home-manager
|
||||
|
|
@ -105,6 +106,9 @@
|
|||
iosevka
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
programs = {
|
||||
_1password.enable = true;
|
||||
_1password-gui = {
|
||||
|
|
|
|||
62
justfile
62
justfile
|
|
@ -1,71 +1,17 @@
|
|||
SOPS_FILE := "./secrets/secrets.yaml"
|
||||
|
||||
default:
|
||||
@just --list
|
||||
|
||||
rebuild-pre: update-nix-secrets
|
||||
rebuild-pre:
|
||||
git add *.nix
|
||||
|
||||
rebuild-post:
|
||||
just check-sops
|
||||
|
||||
# Requires sops to be running and you must have reboot after initial rebuild
|
||||
rebuild: rebuild-pre
|
||||
# sudo nixos-rebuild switch --flake .#$(hostname)
|
||||
scripts/system-flake-rebuild.sh
|
||||
rebuild: rebuild
|
||||
sudo nixos-rebuild switch --flake .#$(hostname)
|
||||
|
||||
# Requires sops to be running and you must have reboot after initial rebuild
|
||||
rebuild-trace: rebuild-pre && rebuild-post
|
||||
scripts/system-flake-rebuild-trace.sh
|
||||
|
||||
home_rebuild: rebuild-pre
|
||||
home_rebuild:
|
||||
home-manager switch --flake .#muhh
|
||||
|
||||
update:
|
||||
nix flake update
|
||||
|
||||
rebuild-update: update && rebuild
|
||||
|
||||
sops:
|
||||
echo "Editing {{SOPS_FILE}}"
|
||||
nix-shell -p sops --run "SOPS_AGE_KEY_FILE=~/.config/sops/age/keys.txt sops {{SOPS_FILE}}"
|
||||
|
||||
age-key:
|
||||
nix-shell -p age --run "age-keygen"
|
||||
|
||||
rekey:
|
||||
cd ../nix-secrets && (\
|
||||
sops updatekeys -y secrets.yaml && \
|
||||
(pre-commit run --all-files || true) && \
|
||||
git add -u && (git commit -m "chore: rekey" || true) && git push \
|
||||
)
|
||||
|
||||
check-sops:
|
||||
scripts/check-sops.sh
|
||||
|
||||
update-nix-secrets:
|
||||
(cd ../nix-secrets && git fetch && git rebase) || true
|
||||
nix flake lock --update-input nix-secrets
|
||||
|
||||
iso:
|
||||
# If we dont remove this folder, libvirtd VM doesnt run with the new iso...
|
||||
rm -rf result
|
||||
nix build ./nixos-installer#nixosConfigurations.iso.config.system.build.isoImage
|
||||
|
||||
iso-install DRIVE: iso
|
||||
sudo dd if=$(eza --sort changed result/iso/*.iso | tail -n1) of={{DRIVE}} bs=4M status=progress oflag=sync
|
||||
|
||||
disko DRIVE PASSWORD:
|
||||
echo "{{PASSWORD}}" > /tmp/disko-password
|
||||
sudo nix --experimental-features "nix-command flakes" run github:nix-community/disko -- \
|
||||
--mode disko \
|
||||
disks/btrfs-luks-impermanence-disko.nix \
|
||||
--arg disk '"{{DRIVE}}"' \
|
||||
--arg password '"{{PASSWORD}}"'
|
||||
rm /tmp/disko-password
|
||||
|
||||
sync USER HOST:
|
||||
rsync -av --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:nix-config/
|
||||
|
||||
sync-secrets USER HOST:
|
||||
rsync -av --filter=':- .gitignore' -e "ssh -l {{USER}}" . {{USER}}@{{HOST}}:nix-secrets/
|
||||
|
|
|
|||
|
|
@ -2,17 +2,6 @@
|
|||
|
||||
{
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
|
||||
nix.optimise = {
|
||||
automatic = true;
|
||||
dates = [ "03:45" ];
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Berlin";
|
||||
Loading…
Reference in a new issue