diff options
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | hosts/vm/cfg.nix | 7 | ||||
| -rw-r--r-- | mixins/sway.nix | 30 | ||||
| -rw-r--r-- | profiles/user.nix | 12 |
4 files changed, 44 insertions, 14 deletions
diff --git a/flake.nix b/flake.nix index 7854f0e..e0cef8c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ impermanence.url = "github:nix-community/impermanence"; agenix.url = "github:ryantm/agenix"; nixos-hardware.url = "github:nixos/nixos-hardware"; + # deploy-rs.url = "github:serokell/deploy-rs"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -27,5 +28,13 @@ pc = mkSystem inputs.nixpkgs "x86_64-linux" "lilith"; vm = mkSystem inputs.nixpkgs "x86_64-linux" "vm"; }; + + # deploy.nodes.some-random-system.profiles.system = { + # user = "root"; + # path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.vm; + # }; + + # This is highly advised, and will prevent many possible mistakes + # checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; }; } diff --git a/hosts/vm/cfg.nix b/hosts/vm/cfg.nix index 30f55a7..c5f17f9 100644 --- a/hosts/vm/cfg.nix +++ b/hosts/vm/cfg.nix @@ -6,18 +6,13 @@ ../../profiles/graphical.nix ../../mixins/tailscale.nix ../../mixins/cli.nix - ../../mixins/greet.nix + # ../../mixins/greet.nix ../../mixins/sway.nix ]; config = { networking.hostName = "vm"; boot.supportedFilesystems = ["9p"]; - fileSystems."/flake" = { - fsType = "9p"; - device = "host0"; - options = ["_netdev"]; - }; boot = { initrd = { supportedFilesystems = ["btrfs"]; diff --git a/mixins/sway.nix b/mixins/sway.nix index f1cf98d..db78c5c 100644 --- a/mixins/sway.nix +++ b/mixins/sway.nix @@ -30,7 +30,31 @@ ${pkgs.slurp}/bin/slurp ''; in { - # config.home-manager.users.tzlil.xdg.configFile."i3status-rust/config.toml".source = ./i3status-rs.toml; + config.home-manager.users.tzlil.xdg.configFile."i3status-rust/config.toml".text = '' + icons = "awesome6" + + [theme] + name = "native" + + [[block]] + block = "music" + hide_when_empty = true + marquee = false + on_click = "playerctl play-pause" + dynamic_width = true + + [[block]] + block = "networkmanager" + + [[block]] + block = "sound" + on_click = "pavucontrol" + + [[block]] + block = "time" + interval = 60 + format = "%a %Y-%m-%d %H:%M" + ''; config.security.pam.services.swaylock = {}; config.home-manager.users.tzlil.programs.mako.enable = true; config.home-manager.users.tzlil.home.packages = with pkgs; [ @@ -38,6 +62,8 @@ in { slurp wf-recorder font-awesome_6 + waypipe + foot ]; config.home-manager.users.tzlil.services.swayidle = let pgrep = "${pkgs.procps}/bin/pgrep"; @@ -110,7 +136,7 @@ in { } ]; - modifier = "Mod4"; + modifier = "Mod5"; left = "h"; down = "n"; up = "e"; diff --git a/profiles/user.nix b/profiles/user.nix index 71c6617..46f8d50 100644 --- a/profiles/user.nix +++ b/profiles/user.nix @@ -45,12 +45,12 @@ }; programs.ssh = { enable = true; - knownHosts = { - pc = { - extraHostNames = [ "100.99.246.128" ]; - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINu5lRKb1Ao4uj1tAV10QHKIvXfC8ncQ65b+oJtxrd1e"; - }; - }; + # knownHosts = { + # pc = { + # extraHostNames = [ "100.99.246.128" ]; + # publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINu5lRKb1Ao4uj1tAV10QHKIvXfC8ncQ65b+oJtxrd1e"; + # }; + # }; matchBlocks."*".identityFile = config.age.secrets."id_ed25519".path; }; }; |