recombine laptop+pc config
This commit is contained in:
commit
faa8d577e4
11 changed files with 153 additions and 338 deletions
|
@ -1,10 +1,10 @@
|
|||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.lix-module.nixosModules.default
|
||||
];
|
||||
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
nix = {
|
||||
package = pkgs.lixPackageSets.git.lix;
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
|
@ -20,7 +20,7 @@
|
|||
optimise.automatic = true;
|
||||
};
|
||||
|
||||
system.nixos.tags = [ "fatcock-xxl" ];
|
||||
system.nixos.tags = ["fatcock-xxl"];
|
||||
|
||||
hjem = {
|
||||
clobberByDefault = true;
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
environment.systemPackages = getPkgs {
|
||||
inherit (pkgs)
|
||||
nixfmt-rfc-style
|
||||
nil
|
||||
;
|
||||
inherit (inputs.nil.packages.${pkgs.system}) nil;
|
||||
};
|
||||
imports = [
|
||||
inputs.nix-index-database.nixosModules.nix-index
|
||||
|
|
324
flake.lock
generated
324
flake.lock
generated
|
@ -276,44 +276,11 @@
|
|||
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"git-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747372754,
|
||||
|
@ -357,11 +324,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755523503,
|
||||
"narHash": "sha256-BWjVjMSb+cVUf5o5R83+WMoeNfrHN8w+UKMhqic5/Ys=",
|
||||
"lastModified": 1755641984,
|
||||
"narHash": "sha256-0d8tolDnYHOMR/KnhuHuilhfqs8OgOPIpIgKzXGTkVk=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "9f34f8b5ff63af86f0fb9eac2c9b092cd479e1c3",
|
||||
"rev": "74bb02ffe7b62d5f96f1a20ead70859c330eb849",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -378,11 +345,11 @@
|
|||
"smfh": "smfh"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755001052,
|
||||
"narHash": "sha256-27YOZ6P8jRjeGydOK/EX/3e4d95eFouSpBSsS08Nryw=",
|
||||
"lastModified": 1755630157,
|
||||
"narHash": "sha256-4XnVeNej5FJLBavw3qxoHI01ojmryeNzT6Mk9Q0nDXQ=",
|
||||
"owner": "feel-co",
|
||||
"repo": "hjem",
|
||||
"rev": "46c06ba2fc5f14772a3f64a6e6e4adbff17b1d9f",
|
||||
"rev": "565a15366d7b5aa5483ebe101fbc0ea27f0516b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -438,26 +405,6 @@
|
|||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755538029,
|
||||
"narHash": "sha256-XVsragfuN8A/tMiPToejH7RofH15toeIGhlXraX+yBo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "bf450a0844e80e6aa22652d3f3728f20cd974527",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nyx",
|
||||
|
@ -535,43 +482,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1755522522,
|
||||
"narHash": "sha256-OiIIM+cvFWCyAn7sFqZQJK1/94EQ522ktlnzakZqM+M=",
|
||||
"rev": "1f47ecef4ef5f67b34653b9c61d6d99b2720eb44",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1f47ecef4ef5f67b34653b9c61d6d99b2720eb44.tar.gz?rev=1f47ecef4ef5f67b34653b9c61d6d99b2720eb44"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751909859,
|
||||
"narHash": "sha256-gbpuESxl/An4GTh7QEbQRYJozVIxWkwVGbWK0/0GoRc=",
|
||||
"rev": "4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f.tar.gz?rev=4d4c2b8f0a801c91ce5b717c77fe3a17efa1402f"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"meat": {
|
||||
"inputs": {
|
||||
"nix-systems": "nix-systems_2",
|
||||
|
@ -595,7 +505,7 @@
|
|||
"naersk": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752689277,
|
||||
|
@ -654,39 +564,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nil": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754679101,
|
||||
"narHash": "sha256-nFK2XhrDS5igmkDQWmyTcgiJsEr3KOcR31DaSy+Fy9s=",
|
||||
"owner": "oxalica",
|
||||
"repo": "nil",
|
||||
"rev": "f80fe365cb441624d1608235e6e793e5dce47fb0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "nil",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"niri": {
|
||||
"inputs": {
|
||||
"niri-stable": "niri-stable",
|
||||
"niri-unstable": "niri-unstable",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"xwayland-satellite-stable": "xwayland-satellite-stable",
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755424351,
|
||||
"narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=",
|
||||
"lastModified": 1755826888,
|
||||
"narHash": "sha256-Z/ZAOQSLY9Tl73+DwSToBnzRRRkqD6vNp0w1I8VmdIo=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "9aa137af01f05386e5bb5050e983750017007a66",
|
||||
"rev": "b954d36801da047fbf563cdb94493b23d745a487",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -716,8 +608,8 @@
|
|||
"inputs": {
|
||||
"naersk": "naersk",
|
||||
"niri": "niri_2",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"systems": "systems_5"
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755582059,
|
||||
|
@ -736,11 +628,11 @@
|
|||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1755419373,
|
||||
"narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=",
|
||||
"lastModified": 1755761324,
|
||||
"narHash": "sha256-LtVHjAqm35txelJtz/7FI5n9o2YyJ+BZ23XC5l/GWes=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599",
|
||||
"rev": "05337ce85560efc4d20cc23e9452a1e1f360007d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -790,7 +682,7 @@
|
|||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_11"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755404379,
|
||||
|
@ -811,9 +703,9 @@
|
|||
"flake-parts": "flake-parts_4",
|
||||
"git-hooks-nix": "git-hooks-nix",
|
||||
"kitty-themes-src": "kitty-themes-src",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"nixpkgs-lib": "nixpkgs-lib_4",
|
||||
"systems": "systems_6"
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748538518,
|
||||
|
@ -937,11 +829,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1755274400,
|
||||
"narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=",
|
||||
"lastModified": 1755704039,
|
||||
"narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899",
|
||||
"rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -968,22 +860,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"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_11": {
|
||||
"locked": {
|
||||
"lastModified": 1755268003,
|
||||
"narHash": "sha256-nNaeJjo861wFR0tjHDyCnHs1rbRtrMgxAKMoig9Sj/w=",
|
||||
|
@ -999,7 +875,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1755186698,
|
||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||
|
@ -1015,7 +891,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1730768919,
|
||||
"narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
|
||||
|
@ -1031,7 +907,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1748538152,
|
||||
"narHash": "sha256-lqAVR6FhqjdY9XpBs+cpIbHJpHxQaEFTeJMu/nkA9s0=",
|
||||
|
@ -1046,13 +922,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_15": {
|
||||
"nixpkgs_14": {
|
||||
"locked": {
|
||||
"lastModified": 1755186698,
|
||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||
"lastModified": 1755615617,
|
||||
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_15": {
|
||||
"locked": {
|
||||
"lastModified": 1755615617,
|
||||
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1063,22 +955,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_16": {
|
||||
"locked": {
|
||||
"lastModified": 1755186698,
|
||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_17": {
|
||||
"locked": {
|
||||
"lastModified": 1754214453,
|
||||
"narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=",
|
||||
|
@ -1192,27 +1068,11 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1749619289,
|
||||
"narHash": "sha256-qX6gXVjaCXXbcn6A9eSLUf8Fm07MgPGe5ir3++y2O1Q=",
|
||||
"lastModified": 1755615617,
|
||||
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f72be405a10668b8b00937b452f2145244103ebc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1755186698,
|
||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
||||
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1222,20 +1082,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"nyx": {
|
||||
"inputs": {
|
||||
"flake-schemas": "flake-schemas",
|
||||
"home-manager": "home-manager_2",
|
||||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
"nixpkgs": "nixpkgs_16",
|
||||
"nixpkgs": "nixpkgs_15",
|
||||
"rust-overlay": "rust-overlay_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755545956,
|
||||
"narHash": "sha256-/dqfdlsu8jonCbwWTlYXC4vVU4/71Yvz/NZMu1NMwos=",
|
||||
"lastModified": 1755785370,
|
||||
"narHash": "sha256-oA3H94jjm+Ju6m2iNv03v6/R42jven8vhIm9heGEGzo=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "f14fadaa130cc0e222271acde3dddc3596b97c69",
|
||||
"rev": "d92228471fabcb46147cdbda83c6476928c4aebd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1245,26 +1121,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1753595452,
|
||||
"narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda",
|
||||
"revCount": 665,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/quickshell/quickshell.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/quickshell/quickshell.git"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"__flake-compat": "__flake-compat",
|
||||
|
@ -1274,20 +1130,15 @@
|
|||
"helix": "helix",
|
||||
"hjem": "hjem",
|
||||
"hjem-rum": "hjem-rum",
|
||||
"home-manager": "home-manager",
|
||||
"hudcore": "hudcore",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"meat": "meat",
|
||||
"nil": "nil",
|
||||
"niri": "niri",
|
||||
"niri-tag": "niri-tag",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-rice": "nix-rice",
|
||||
"nixpkgs": "nixpkgs_15",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"nyx": "nyx",
|
||||
"quickshell": "quickshell",
|
||||
"zedless": "zedless"
|
||||
}
|
||||
},
|
||||
|
@ -1488,21 +1339,6 @@
|
|||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_5": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
|
@ -1517,7 +1353,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_6": {
|
||||
"systems_5": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
|
@ -1596,16 +1432,16 @@
|
|||
"xwayland-satellite-stable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748488455,
|
||||
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
|
||||
"lastModified": 1755491097,
|
||||
"narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
|
||||
"rev": "388d291e82ffbc73be18169d39470f340707edaa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Supreeeme",
|
||||
"ref": "v0.6",
|
||||
"ref": "v0.7",
|
||||
"repo": "xwayland-satellite",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -1613,11 +1449,11 @@
|
|||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1755219541,
|
||||
"narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=",
|
||||
"lastModified": 1755491097,
|
||||
"narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "5a184d435927c3423f0ad189ea2b490578450fb7",
|
||||
"rev": "388d291e82ffbc73be18169d39470f340707edaa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -1629,7 +1465,7 @@
|
|||
"zedless": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_5",
|
||||
"nixpkgs": "nixpkgs_17"
|
||||
"nixpkgs": "nixpkgs_16"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754831523,
|
||||
|
|
26
flake.nix
26
flake.nix
|
@ -7,30 +7,12 @@
|
|||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
helix.url = "github:helix-editor/helix";
|
||||
|
||||
nix-index-database.url = "github:Mic92/nix-index-database";
|
||||
|
||||
nix-rice.url = "github:bertof/nix-rice";
|
||||
|
||||
nil.url = "github:oxalica/nil";
|
||||
|
||||
lix = {
|
||||
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.lix.follows = "lix";
|
||||
};
|
||||
|
||||
meat.url = "git+https://git.atagen.co/atagen/meat";
|
||||
|
||||
culr.url = "git+https://git.atagen.co/atagen/culr";
|
||||
|
@ -49,10 +31,10 @@
|
|||
|
||||
hudcore.url = "git+https://git.atagen.co/atagen/hudcore-plymouth.git";
|
||||
|
||||
quickshell = {
|
||||
url = "git+https://git.outfoxxed.me/quickshell/quickshell.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# quickshell = {
|
||||
# url = "git+https://git.outfoxxed.me/quickshell/quickshell.git";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
# };
|
||||
|
||||
nyx.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||
|
||||
|
|
|
@ -1,40 +1,9 @@
|
|||
{ config, scope, ... }:
|
||||
let
|
||||
inherit (config) rice;
|
||||
in
|
||||
{
|
||||
config,
|
||||
scope,
|
||||
...
|
||||
}:
|
||||
scope "boot" {
|
||||
tmp.useTmpfs = true;
|
||||
|
||||
initrd.systemd.enable = true;
|
||||
|
||||
loader.limine = {
|
||||
enable = true;
|
||||
style =
|
||||
let
|
||||
pal = rice.palette.shortHex;
|
||||
in
|
||||
{
|
||||
wallpapers = [ rice.bg.src ];
|
||||
interface = {
|
||||
brandingColor = 1;
|
||||
branding = "welcome to quiver";
|
||||
};
|
||||
graphicalTerminal =
|
||||
let
|
||||
getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";";
|
||||
in
|
||||
{
|
||||
palette = getPal pal.normal;
|
||||
brightPalette = getPal pal.bright;
|
||||
marginGradient = 0;
|
||||
margin = 256;
|
||||
foreground = pal.util.fg;
|
||||
background = "20" + pal.util.bg;
|
||||
brightForeground = pal.bright.yellow;
|
||||
brightBackground = pal.util.bg;
|
||||
};
|
||||
backdrop = pal.util.bg;
|
||||
};
|
||||
maxGenerations = 5;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ ShellRoot {
|
|||
|
||||
// bg
|
||||
Variants {
|
||||
model: Quickshell.screens.filter(s => s.name == "DP-2")
|
||||
model: Quickshell.screens
|
||||
delegate: PanelWindow {
|
||||
id: bg
|
||||
anchors {
|
||||
|
@ -29,8 +29,8 @@ ShellRoot {
|
|||
|
||||
Image {
|
||||
asynchronous: true
|
||||
width: 2560
|
||||
height: 1440
|
||||
width: bg.width
|
||||
height: bg.height
|
||||
source: "assets/pathway-m-rework.png"
|
||||
}
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ ShellRoot {
|
|||
|
||||
// rhs main
|
||||
Variants {
|
||||
model: Quickshell.screens.filter(s => s.name == "DP-2")
|
||||
model: Quickshell.screens
|
||||
delegate: PanelWindow {
|
||||
id: bink
|
||||
property var modelData
|
||||
|
@ -80,7 +80,7 @@ ShellRoot {
|
|||
|
||||
// centre main
|
||||
Variants {
|
||||
model: Quickshell.screens.filter(s => s.name == "DP-2")
|
||||
model: Quickshell.screens
|
||||
delegate: PanelWindow {
|
||||
id: windowTitle
|
||||
property var modelData
|
||||
|
@ -144,7 +144,7 @@ ShellRoot {
|
|||
|
||||
// bottom middle main
|
||||
Variants {
|
||||
model: Quickshell.screens.filter(s => s.name == "DP-2")
|
||||
model: Quickshell.screens
|
||||
delegate: PanelWindow {
|
||||
id: tags
|
||||
property var modelData
|
||||
|
|
|
@ -13,8 +13,4 @@
|
|||
};
|
||||
services.mullvad-vpn.enable = true;
|
||||
|
||||
environment.systemPackages = [ pkgs.ciscoPacketTracer8 ];
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"libxml2-2.13.8"
|
||||
];
|
||||
}
|
||||
|
|
|
@ -12,17 +12,10 @@ let
|
|||
in
|
||||
{
|
||||
# quickshell stuff
|
||||
user.packages =
|
||||
getPkgs {
|
||||
inherit (pkgs.kdePackages) qtbase qtdeclarative;
|
||||
inherit (pkgs) wl-clipboard;
|
||||
}
|
||||
++ [
|
||||
(inputs.quickshell.packages.${pkgs.system}.default.override {
|
||||
withHyprland = false;
|
||||
withI3 = false;
|
||||
})
|
||||
];
|
||||
user.packages = getPkgs {
|
||||
inherit (pkgs.kdePackages) qtbase qtdeclarative;
|
||||
inherit (pkgs) wl-clipboard quickshell;
|
||||
};
|
||||
|
||||
systemd.user.services.quickshell = {
|
||||
path = [ inputs.niri.packages.${pkgs.system}.niri-unstable ];
|
||||
|
@ -37,10 +30,7 @@ in
|
|||
];
|
||||
};
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
serviceConfig.ExecStart = "${getExe' (inputs.quickshell.packages.${pkgs.system}.default.override {
|
||||
withHyprland = false;
|
||||
withI3 = false;
|
||||
}) "qs"}";
|
||||
serviceConfig.ExecStart = "${getExe pkgs.quickshell}";
|
||||
};
|
||||
|
||||
quick.services = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ scope, ... }:
|
||||
{scope, ...}:
|
||||
scope "boot" {
|
||||
kernelParams = [
|
||||
"mitigations=off"
|
||||
|
@ -15,11 +15,15 @@ scope "boot" {
|
|||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
initrd.kernelModules = [ "dm-snapshot" ];
|
||||
initrd.kernelModules = ["dm-snapshot"];
|
||||
kernelModules = [
|
||||
"iwlwifi"
|
||||
"kvm-intel"
|
||||
];
|
||||
loader.systemd-boot.configurationLimit = 2;
|
||||
loader.systemd-boot = {
|
||||
enable = true;
|
||||
consoleMode = "max";
|
||||
configurationLimit = 2;
|
||||
};
|
||||
loader.efi.canTouchEfiVariables = true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,36 @@
|
|||
{ scope, ... }:
|
||||
{ scope, pkgs, config, ...}:
|
||||
scope "boot" {
|
||||
loader.limine = {
|
||||
enable = true;
|
||||
style =
|
||||
let
|
||||
pal = config.rice.palette.shortHex;
|
||||
in
|
||||
{
|
||||
wallpapers = [ config.rice.bg.src ];
|
||||
interface = {
|
||||
brandingColor = 1;
|
||||
branding = "welcome to quiver";
|
||||
};
|
||||
graphicalTerminal =
|
||||
let
|
||||
getPal = p: builtins.attrValues p |> builtins.concatStringsSep ";";
|
||||
in
|
||||
{
|
||||
palette = getPal pal.normal;
|
||||
brightPalette = getPal pal.bright;
|
||||
marginGradient = 0;
|
||||
margin = 256;
|
||||
foreground = pal.util.fg;
|
||||
background = "20" + pal.util.bg;
|
||||
brightForeground = pal.bright.yellow;
|
||||
brightBackground = pal.util.bg;
|
||||
};
|
||||
backdrop = pal.util.bg;
|
||||
};
|
||||
maxGenerations = 5;
|
||||
};
|
||||
|
||||
initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
|
|
7
hosts/quiver/cisco.nix
Normal file
7
hosts/quiver/cisco.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = [ pkgs.ciscoPacketTracer8 ];
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"libxml2-2.13.8"
|
||||
];
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue