Compare commits
2 commits
40bc68df75
...
62d2b13910
Author | SHA1 | Date | |
---|---|---|---|
62d2b13910 | |||
|
6c7c412533 |
4 changed files with 22 additions and 65 deletions
70
flake.lock
generated
70
flake.lock
generated
|
@ -63,22 +63,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"eza": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736397430,
|
|
||||||
"narHash": "sha256-l00P7P3zcx8rzYOOQMNUwBqK/yz/4Cv8G8+pYbfyQ5Y=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d722e8ce81cf103280ce1ff65accb3fc25cbd2ba",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d722e8ce81cf103280ce1ff65accb3fc25cbd2ba",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -264,11 +248,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736366465,
|
"lastModified": 1736508663,
|
||||||
"narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=",
|
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5",
|
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -285,11 +269,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736366465,
|
"lastModified": 1736508663,
|
||||||
"narHash": "sha256-Fo68EF6p/N9GJyHiAUbXtiE7IJlb3IMjK86LuxFMsRU=",
|
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7e00856596891850ba5ad4c5ecd2ed74468c08c5",
|
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -376,11 +360,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736012469,
|
"lastModified": 1736523798,
|
||||||
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
|
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
|
"rev": "130595eba61081acde9001f43de3248d8888ac4a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -390,22 +374,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-borg": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1735547260,
|
|
||||||
"narHash": "sha256-ScKuaBbUXNqS9c6Y+N647BAQx7SvKywpu5MxBV3Y5pk=",
|
|
||||||
"owner": "cything",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "53add6c0c30200663cd21beb06672ec2c8afc176",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cything",
|
|
||||||
"ref": "borg",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-btrbk": {
|
"nixpkgs-btrbk": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735945390,
|
"lastModified": 1735945390,
|
||||||
|
@ -424,11 +392,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-garage": {
|
"nixpkgs-garage": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736656100,
|
"lastModified": 1736657901,
|
||||||
"narHash": "sha256-Y/r6cOYW4UsFj55gp0FTdxDmrrccn6wXQo/zll2Yx8g=",
|
"narHash": "sha256-KpbFF8d5cqcBF7+m5fXDcPn+ADg3kURbX49JGx18NXU=",
|
||||||
"owner": "cything",
|
"owner": "cything",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9a35d495d2f49eee003b57265228844bb48c933e",
|
"rev": "616be0a7b830a10d0874d569aabd40034c9151aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -469,11 +437,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736430661,
|
"lastModified": 1736715511,
|
||||||
"narHash": "sha256-0dabFSGqcPo47WfgPRM5usnVXaGMdYvPlDJ5PeIqjr4=",
|
"narHash": "sha256-5YAiZ3wrEJ/fzFoCwNf14xqfRTvgdcnl/+y0vye3Y6A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "67de84848e43ca6a5025e4f8eddc2f6684a51f2b",
|
"rev": "35d6c12626f9895cd5d8ccf5d19c3d00de394334",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -535,11 +503,9 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"eza": "eza",
|
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-borg": "nixpkgs-borg",
|
|
||||||
"nixpkgs-btrbk": "nixpkgs-btrbk",
|
"nixpkgs-btrbk": "nixpkgs-btrbk",
|
||||||
"nixpkgs-garage": "nixpkgs-garage",
|
"nixpkgs-garage": "nixpkgs-garage",
|
||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
|
@ -579,11 +545,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736203741,
|
"lastModified": 1736515725,
|
||||||
"narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=",
|
"narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773",
|
"rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -28,10 +28,8 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-borg.url = "github:cything/nixpkgs/borg"; # unmerged PR
|
|
||||||
nixpkgs-btrbk.url = "github:cything/nixpkgs/btrbk"; # unmerged PR
|
nixpkgs-btrbk.url = "github:cything/nixpkgs/btrbk"; # unmerged PR
|
||||||
eza.url = "github:nixos/nixpkgs/d722e8ce81cf103280ce1ff65accb3fc25cbd2ba";
|
nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR
|
||||||
nixpkgs-garage.url = "github:cything/nixpkgs/garage-module";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
@ -82,9 +80,8 @@
|
||||||
flake: pkgNames: _final: prev:
|
flake: pkgNames: _final: prev:
|
||||||
overridePkgsFromFlake prev flake pkgNames;
|
overridePkgsFromFlake prev flake pkgNames;
|
||||||
overlays = [
|
overlays = [
|
||||||
(overlayPkgsFromFlake inputs.eza [
|
# (overlayPkgsFromFlake inputs.eza [
|
||||||
"eza"
|
# ])
|
||||||
])
|
|
||||||
] ++ import ./overlay;
|
] ++ import ./overlay;
|
||||||
|
|
||||||
pkgsFor = lib.genAttrs systems (
|
pkgsFor = lib.genAttrs systems (
|
||||||
|
|
|
@ -125,6 +125,7 @@ for_window [app_id=mpv] inhibit_idle visible, floating enable, sticky enable
|
||||||
for_window [app_id="LibreWolf" title="^Extension"] floating enable
|
for_window [app_id="LibreWolf" title="^Extension"] floating enable
|
||||||
for_window [floating] border csd
|
for_window [floating] border csd
|
||||||
for_window [app_id="Bitwarden"] floating enable
|
for_window [app_id="Bitwarden"] floating enable
|
||||||
|
for_window [app_id=anki title="Add"] floating enable
|
||||||
|
|
||||||
bar {
|
bar {
|
||||||
swaybar_command waybar
|
swaybar_command waybar
|
||||||
|
|
|
@ -31,13 +31,6 @@ let
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
{
|
|
||||||
disabledModules = [ "services/backup/borgbackup.nix" ];
|
|
||||||
}
|
|
||||||
(inputs.nixpkgs-borg + "/nixos/modules/services/backup/borgbackup.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
options.my.backup = {
|
options.my.backup = {
|
||||||
enable = lib.mkEnableOption "backup";
|
enable = lib.mkEnableOption "backup";
|
||||||
paths = lib.mkOption {
|
paths = lib.mkOption {
|
||||||
|
|
Loading…
Add table
Reference in a new issue