diff --git a/flake.lock b/flake.lock index 47f00976..50370b8b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,26 +20,6 @@ "type": "github" } }, - "beautysh": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1641830469, - "narHash": "sha256-uhDmgNP/biOWe4FtOa6c2xZnREH+NP9rdrMm0LccRUk=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "e85d9736927c0fcf2abb05cb3a2d8d9b4502a2eb", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "blank": { "locked": { "lastModified": 1625557891, @@ -55,31 +35,6 @@ "type": "github" } }, - "bud": { - "inputs": { - "beautysh": "beautysh", - "devshell": [ - "digga", - "devshell" - ], - "nixpkgs": [ - "nixos" - ] - }, - "locked": { - "lastModified": 1642035816, - "narHash": "sha256-1Lq5c1AeUv/1SK08+O704JVfDdD/zodHzA0cv0TIga8=", - "owner": "divnix", - "repo": "bud", - "rev": "a789d710851441ba7e7cd59be378623b1fe05688", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "bud", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -102,7 +57,6 @@ }, "deploy": { "inputs": { - "fenix": "fenix", "flake-compat": "flake-compat", "nixpkgs": [ "nixos" @@ -110,15 +64,15 @@ "utils": "utils" }, "locked": { - "lastModified": 1639771334, - "narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=", - "owner": "input-output-hk", + "lastModified": 1643787431, + "narHash": "sha256-8IwuVgXulRE3ZWq6z8mytarawC32pKPKR20EyDtSH+w=", + "owner": "serokell", "repo": "deploy-rs", - "rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f", + "rev": "4154ba1aaaf7333a916384c348d867d03b6f1409", "type": "github" }, "original": { - "owner": "input-output-hk", + "owner": "serokell", "repo": "deploy-rs", "type": "github" } @@ -172,25 +126,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1639117493, - "narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=", - "owner": "nix-community", - "repo": "fenix", - "rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -225,11 +160,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -240,7 +175,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils" }, "locked": { "lastModified": 1639385028, @@ -257,36 +192,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -408,7 +313,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1637655461, @@ -440,53 +345,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1633971123, - "narHash": "sha256-WmI4NbH1IPGFWVkuBkKoYgOnxgwSfWDgdZplJlQ93vA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e4ef597edfd8a0ba5f12362932fc9b1dd01a0aef", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1645098413, - "narHash": "sha256-kROvsEv0t0zhl1c57ELsFr0Bkq90VOnQtIdNY8OHZ2U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e6dd09d2420ff6d6c084e2e1a14c3404d871421", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1638986258, - "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "581d2d6c9cd5c289002203581d8aa0861963a933", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1644972330, "narHash": "sha256-6V2JFpTUzB9G+KcqtUR1yl7f6rd9495YrFECslEmbGw=", @@ -518,7 +376,7 @@ "nvfetcher": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixos" ] @@ -537,29 +395,9 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1633382856, - "narHash": "sha256-hYlet806M9xJj4yxf0g5fhDT2IEUVIMAl7sqIeZ8DUM=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "705cbfa10e3d9bfed2e59e0256844ae3704dbd7e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", - "bud": "bud", "darwin": "darwin", "deploy": "deploy", "digga": "digga", @@ -572,23 +410,6 @@ "nvfetcher": "nvfetcher" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1639071661, - "narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=", - "owner": "rust-analyzer", - "repo": "rust-analyzer", - "rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31", - "type": "github" - }, - "original": { - "owner": "rust-analyzer", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1637014545, diff --git a/flake.nix b/flake.nix index 574b315a..61adcfa5 100644 --- a/flake.nix +++ b/flake.nix @@ -16,17 +16,13 @@ digga.inputs.home-manager.follows = "home"; digga.inputs.deploy.follows = "deploy"; - bud.url = "github:divnix/bud"; - bud.inputs.nixpkgs.follows = "nixos"; - bud.inputs.devshell.follows = "digga/devshell"; - home.url = "github:nix-community/home-manager/release-21.11"; home.inputs.nixpkgs.follows = "nixos"; darwin.url = "github:LnL7/nix-darwin"; darwin.inputs.nixpkgs.follows = "nixos"; - deploy.url = "github:input-output-hk/deploy-rs"; + deploy.url = "github:serokell/deploy-rs"; deploy.inputs.nixpkgs.follows = "nixos"; agenix.url = "github:ryantm/agenix"; @@ -44,7 +40,6 @@ outputs = { self , digga - , bud , nixos , home , nixos-hardware @@ -96,7 +91,6 @@ digga.nixosModules.nixConfig home.nixosModules.home-manager agenix.nixosModules.age - bud.nixosModules.bud ]; }; @@ -149,16 +143,18 @@ homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; - deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; - - defaultTemplate = self.templates.bud; - templates.bud.path = ./.; - templates.bud.description = "bud template"; + deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations + { + curve = { + profilesOrder = [ "system" "curve" ]; + profiles.anish = { + user = "anish"; + path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.anish; + }; + }; + }; + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib; } - // - { - budModules = { devos = import ./bud; }; - } ; } diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index ef021249..d1051bce 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -10,8 +10,6 @@ imports = [ ] ++ suites.hmBase; }; - #bud.enable = true; - fileSystems."/mnt/ftp" = { device = "192.168.1.240:/home/ftp"; fsType = "nfs"; diff --git a/profiles/nvim/nvim.nix b/profiles/nvim/nvim.nix index 2cf9d1f4..a1231c12 100644 --- a/profiles/nvim/nvim.nix +++ b/profiles/nvim/nvim.nix @@ -274,7 +274,6 @@ in nnoremap ff :DashboardFindFile nnoremap fm :DashboardJumpMark nnoremap cn :DashboardNewFile - nnoremap tn :tabnew autocmd FileType dashboard set showtabline=0 | autocmd WinLeave set showtabline=2 " fzf diff --git a/shell/default.nix b/shell/default.nix index aef90a55..24f1a332 100644 --- a/shell/default.nix +++ b/shell/default.nix @@ -1,8 +1,5 @@ { self, inputs, ... }: { - externalModules = with inputs; [ - bud.devshellModules.bud - ]; modules = [ ./devos.nix ]; diff --git a/users/profiles/desktop/bin/powermenu b/users/profiles/desktop/bin/powermenu index d2bbe400..001c14a4 100755 --- a/users/profiles/desktop/bin/powermenu +++ b/users/profiles/desktop/bin/powermenu @@ -12,20 +12,20 @@ log_out="\tLogout" options="$power_off\n$reboot\n$lock\n$suspend\n$log_out" case "$(echo -e "$options" | $rofi_command -dmenu -selected-row 2)" in - $power_off) - systemctl poweroff - ;; - $reboot) - systemctl reboot - ;; - $lock) - zzz # TODO doesn't do anything - ;; - $suspend) - dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause - systemctl suspend - ;; - $log_out) - bspc quit - ;; + " Shutdown") + systemctl poweroff + ;; + " Reboot") + systemctl reboot + ;; + " Lock") + zzz # TODO doesn't do anything + ;; + "鈴 Sleep") + dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause + systemctl suspend + ;; + " Logout") + bspc quit + ;; esac diff --git a/users/profiles/email/default.nix b/users/profiles/email/default.nix index 935c8507..9aa27ad7 100644 --- a/users/profiles/email/default.nix +++ b/users/profiles/email/default.nix @@ -28,7 +28,7 @@ set editor = "nvim +':set textwidth=0'" #set virtual_spoolfile=yes - set folder="~/Mail/" + set folder="~/Mail/anish" set mbox_type = Maildir mailboxes `find ~/Mail/anish/* -maxdepth 0 -type d | grep -v "tmp\|new\|cur" | sed 's|/home/anish/Mail/|=\"|g' | sed 's|$|\"|g' | tr '\n' ' '`