From 62d2b139102e209524487b5aa949474186ce7df7 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 12 Jan 2025 11:30:36 -0500 Subject: [PATCH] rm old overlays and make sway float anki add window --- flake.lock | 34 ---------------------------------- flake.nix | 9 +++------ home/sway/config | 1 + modules/backup.nix | 7 ------- 4 files changed, 4 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 83cb365..cd5c828 100644 --- a/flake.lock +++ b/flake.lock @@ -63,22 +63,6 @@ "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": false, "locked": { @@ -390,22 +374,6 @@ "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": { "locked": { "lastModified": 1735945390, @@ -535,11 +503,9 @@ "root": { "inputs": { "disko": "disko", - "eza": "eza", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs", - "nixpkgs-borg": "nixpkgs-borg", "nixpkgs-btrbk": "nixpkgs-btrbk", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", diff --git a/flake.nix b/flake.nix index e84606c..6f869f7 100644 --- a/flake.nix +++ b/flake.nix @@ -28,10 +28,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs-borg.url = "github:cything/nixpkgs/borg"; # 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"; + nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR }; nixConfig = { @@ -82,9 +80,8 @@ flake: pkgNames: _final: prev: overridePkgsFromFlake prev flake pkgNames; overlays = [ - (overlayPkgsFromFlake inputs.eza [ - "eza" - ]) + # (overlayPkgsFromFlake inputs.eza [ + # ]) ] ++ import ./overlay; pkgsFor = lib.genAttrs systems ( diff --git a/home/sway/config b/home/sway/config index 7412fc4..1005b61 100644 --- a/home/sway/config +++ b/home/sway/config @@ -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 [floating] border csd for_window [app_id="Bitwarden"] floating enable +for_window [app_id=anki title="Add"] floating enable bar { swaybar_command waybar diff --git a/modules/backup.nix b/modules/backup.nix index e632726..7524c55 100644 --- a/modules/backup.nix +++ b/modules/backup.nix @@ -31,13 +31,6 @@ let ]; in { - imports = [ - { - disabledModules = [ "services/backup/borgbackup.nix" ]; - } - (inputs.nixpkgs-borg + "/nixos/modules/services/backup/borgbackup.nix") - ]; - options.my.backup = { enable = lib.mkEnableOption "backup"; paths = lib.mkOption {