Merge branch 'main' of ssh://codeberg.org/dnscio/nix-config
This commit is contained in:
commit
80c5a89784
4 changed files with 194 additions and 51 deletions
65
flake.lock
generated
65
flake.lock
generated
|
|
@ -89,11 +89,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1765489453,
|
||||
"narHash": "sha256-wLSrwiYr7ck5jN56lJp8YzWuLk5dpRd1v+8Ta7ru608=",
|
||||
"lastModified": 1765876616,
|
||||
"narHash": "sha256-j9BnLfWdJrJrETfmfnlnpvRGKVp1MLRaw78oYDSnTRY=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "c3e6306094f23d57c40f7fba007303fba4db0ba9",
|
||||
"rev": "2843ec4d4793815111a1b99e170ec7b1842b7f9f",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -146,11 +146,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765479516,
|
||||
"narHash": "sha256-yGZcd4bvygzG9EFi0QOW4cJwN8FhZwQXDf/D4Y4bh0w=",
|
||||
"lastModified": 1765860045,
|
||||
"narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "9b5ac85d79d1136e51834f6c0d6987107ea28181",
|
||||
"rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -167,11 +167,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762964643,
|
||||
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
||||
"lastModified": 1765682243,
|
||||
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
||||
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -208,11 +208,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765211814,
|
||||
"narHash": "sha256-USI9biMhvWBs7hC9JlDS3/Oi/TlFNcYCszA5GT9gp3o=",
|
||||
"lastModified": 1765808204,
|
||||
"narHash": "sha256-pnI+SmXYXeNofYBYbcCkj4CTJdoXwJYYPgc1MutMz0Q=",
|
||||
"owner": "JakeStanger",
|
||||
"repo": "ironbar",
|
||||
"rev": "222f5c55b655b627d0703cb05948fc61e09ab231",
|
||||
"rev": "c2f1043524b8eee45369692e56bb170b640df047",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -250,11 +250,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765065051,
|
||||
"narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=",
|
||||
"lastModified": 1765684049,
|
||||
"narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79",
|
||||
"rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -313,6 +313,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1765762245,
|
||||
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1744536153,
|
||||
|
|
@ -343,11 +359,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1765270179,
|
||||
"narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=",
|
||||
"lastModified": 1765803225,
|
||||
"narHash": "sha256-xwaZV/UgJ04+ixbZZfoDE8IsOWjtvQZICh9aamzPnrg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9",
|
||||
"rev": "ac9a217389ee622d4e1e727c4efcc9c4bc9089ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -387,11 +403,11 @@
|
|||
},
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"lastModified": 1765472234,
|
||||
"narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -411,6 +427,7 @@
|
|||
"nix-darwin": "nix-darwin",
|
||||
"nix-homebrew": "nix-homebrew",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"zellij-switch": "zellij-switch",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
|
|
@ -506,11 +523,11 @@
|
|||
"nixpkgs": "nixpkgs_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765430623,
|
||||
"narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=",
|
||||
"lastModified": 1765895443,
|
||||
"narHash": "sha256-yftYGV0skUwV5neT1BJrs7RRbXPKozQTzC7d9c7kEFs=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd",
|
||||
"rev": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
inputs = {
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -53,7 +55,7 @@
|
|||
nixosModules.steam = import ./modules/steam;
|
||||
nixosModules.niriSystem = import ./modules/wm/niri-system;
|
||||
|
||||
nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem {
|
||||
nixosConfigurations.dnsc-machine = inputs.nixpkgs-stable.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs outputs; };
|
||||
modules = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
outputs,
|
||||
pkgs,
|
||||
|
|
@ -27,9 +26,15 @@
|
|||
|
||||
# Device specific overlays
|
||||
# Overlays for all devices are defined
|
||||
# in modules/default.nix
|
||||
# in flake.nix
|
||||
nixpkgs.overlays = [
|
||||
inputs.zellij-switch.overlays.default
|
||||
(final: prev: {
|
||||
python3Packages = prev.python3Packages // {
|
||||
python-dbusmock =
|
||||
inputs.nixpkgs-backport-fix.legacyPackages.x86_64-linux.python3Packages.python-dbusmock;
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
# General settings
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
|
|
@ -28,8 +27,8 @@
|
|||
Fingerprinting = true;
|
||||
};
|
||||
};
|
||||
profiles.default = {
|
||||
containersForce = true;
|
||||
profiles.default =
|
||||
let
|
||||
containers = {
|
||||
Personal = {
|
||||
color = "purple";
|
||||
|
|
@ -37,18 +36,138 @@
|
|||
id = 1;
|
||||
};
|
||||
};
|
||||
spacesForce = true;
|
||||
spaces =
|
||||
let
|
||||
containers = config.programs.zen-browser.profiles."default".containers;
|
||||
in
|
||||
{
|
||||
"Space" = {
|
||||
id = "c6de089c-410d-4206-961d-ab11f988d40a";
|
||||
spaces = {
|
||||
"Personal" = {
|
||||
id = "53d805fa-2cc1-44b5-929b-a72cc83d9587";
|
||||
position = 1000;
|
||||
container = containers."Personal".id;
|
||||
};
|
||||
};
|
||||
pins = {
|
||||
"Home" = {
|
||||
id = "245843da-9cc4-4c78-ad43-ea7d9139838b";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
url = "https://home.dnsc.io";
|
||||
position = 100;
|
||||
};
|
||||
"Apps" = {
|
||||
id = "092abc24-d7c5-4012-b311-d4ee0b193537";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
isGroup = true;
|
||||
isFolderCollapsed = true;
|
||||
editedTitle = true;
|
||||
position = 200;
|
||||
};
|
||||
"Mail" = {
|
||||
id = "746d2753-f042-4050-89b3-d2e5f1697a90";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Apps".id;
|
||||
url = "https://app.fastmail.com/mail/Inbox/?u=b88140d0";
|
||||
position = 201;
|
||||
};
|
||||
"Finance" = {
|
||||
id = "02bad3d7-7a88-4ca2-8b29-ced5f9956ac6";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Apps".id;
|
||||
url = "https://finance.dnsc.io/";
|
||||
position = 202;
|
||||
};
|
||||
"Codeberg" = {
|
||||
id = "c79480bb-ad11-4bd4-b4a2-f6d9a1790278";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Apps".id;
|
||||
url = "https://codeberg.org/dnscio";
|
||||
position = 203;
|
||||
};
|
||||
"Github" = {
|
||||
id = "811448b3-ac9b-4f56-b7c1-f0d5b1d25b62";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Apps".id;
|
||||
url = "https://github.com/";
|
||||
position = 204;
|
||||
};
|
||||
"Entertainment" = {
|
||||
id = "969167a2-c586-4382-a6f8-a5f17df43b51";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
isGroup = true;
|
||||
isFolderCollapsed = true;
|
||||
editedTitle = true;
|
||||
folderParentId = pins."Entertainment".id;
|
||||
position = 300;
|
||||
};
|
||||
"Twitch" = {
|
||||
id = "043a9077-ce81-4f6d-8f61-d2947c675eef";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
url = "https://www.twitch.tv/directory/following";
|
||||
folderParentId = pins."Entertainment".id;
|
||||
position = 301;
|
||||
};
|
||||
"Youtube" = {
|
||||
id = "54b399ae-1106-4b91-9e2c-893e9114c215";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Entertainment".id;
|
||||
url = "https://www.youtube.com/feed/subscriptions";
|
||||
position = 302;
|
||||
};
|
||||
"Nix" = {
|
||||
id = "02329197-7617-42e0-bc9a-1d09415ef10c";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
isGroup = true;
|
||||
isFolderCollapsed = true;
|
||||
editedTitle = true;
|
||||
position = 400;
|
||||
};
|
||||
"Packages" = {
|
||||
id = "c79480bb-ad11-4bd4-b4a2-f6d9a1790278";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Nix".id;
|
||||
url = "https://search.nixos.org/packages";
|
||||
position = 401;
|
||||
};
|
||||
"Options" = {
|
||||
id = "63930b7a-d423-4a74-8edb-0179b9c9902e";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Nix".id;
|
||||
url = "https://search.nixos.org/options";
|
||||
position = 402;
|
||||
};
|
||||
"Home Manager" = {
|
||||
id = "97194c72-9ab9-4310-90f8-397fd7ce626a";
|
||||
workspace = spaces.Personal.id;
|
||||
container = containers.Personal.id;
|
||||
folderParentId = pins."Nix".id;
|
||||
url = "https://home-manager-options.extranix.com";
|
||||
position = 403;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
containersForce = true;
|
||||
pinsForce = true;
|
||||
spacesForce = true;
|
||||
inherit containers pins spaces;
|
||||
|
||||
settings = {
|
||||
"layout.css.prefers-color-scheme.content-override" = 0;
|
||||
};
|
||||
|
||||
search = {
|
||||
default = "google";
|
||||
force = true;
|
||||
};
|
||||
|
||||
extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
|
||||
ublock-origin
|
||||
dearrow
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue