diff --git a/flake.lock b/flake.lock index 1959b69..7242ccc 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717555607, - "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { @@ -88,11 +88,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index e18a810..f724184 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -10,6 +10,7 @@ # CLI ../../modules/home/cli/common + ../../modules/home/cli/develop.nix ../../modules/home/cli/ssh.nix ]; @@ -49,6 +50,8 @@ gimp inkscape + # Development + unstable.drawio ]; home.stateVersion = "24.05"; diff --git a/hosts/vnix-ctr/default.nix b/hosts/vnix-ctr/default.nix index 58cf5ba..18ffb29 100644 --- a/hosts/vnix-ctr/default.nix +++ b/hosts/vnix-ctr/default.nix @@ -37,7 +37,7 @@ networking.networkmanager.enable = true; networking.firewall = { - allowedTCPPorts = [ 1080 ]; + allowedTCPPorts = [ 80 443 1080 ]; allowedUDPPorts = [ 53 ]; }; diff --git a/modules/home/cli/common/helix.nix b/modules/home/cli/common/helix.nix index e4743ef..7f809f1 100644 --- a/modules/home/cli/common/helix.nix +++ b/modules/home/cli/common/helix.nix @@ -1,6 +1,10 @@ { config, pkgs, ... }: { + home.packages = with pkgs; [ + unstable.marksman + ]; + programs.helix = { enable = true; package = pkgs.unstable.helix; diff --git a/modules/home/cli/common/shell.nix b/modules/home/cli/common/shell.nix index de68721..19ca042 100644 --- a/modules/home/cli/common/shell.nix +++ b/modules/home/cli/common/shell.nix @@ -18,23 +18,4 @@ enable = true; enableBashIntegration = true; }; - - programs.zellij = { - enable = true; - # enableBashIntegration = true; - }; - - home.file.zellij = { - target = ".config/zellij/config.kdl"; - text = '' - pane_frames false - default_layout "compact" - keybinds { - normal { - bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; } - } - } - ''; - }; - } diff --git a/modules/home/cli/develop.nix b/modules/home/cli/develop.nix new file mode 100644 index 0000000..fe23253 --- /dev/null +++ b/modules/home/cli/develop.nix @@ -0,0 +1,46 @@ +{ pkgs, ... }: + +{ + home.packages = with pkgs; [ + unstable.devenv + ]; + + programs.direnv = { + enable = true; + enableBashIntegration = true; + }; + + programs.zellij = { + enable = true; + # enableBashIntegration = true; + }; + + home.file.zellij = { + target = ".config/zellij/config.kdl"; + text = '' + pane_frames false + keybinds { + normal { + bind "Ctrl e" { ToggleFloatingPanes; SwitchToMode "normal"; } + } + } + ''; + }; + + home.file.zellij-layout-default = { + target = ".config/zellij/layouts/default.kdl"; + text = '' + layout { + pane + floating_panes { + pane { + width "80%" + height "80%" + x "10%" + y "10%" + } + } + } + ''; + }; +}