diff --git a/config/base.nix b/config/base.nix index aea7616..cc85ad8 100644 --- a/config/base.nix +++ b/config/base.nix @@ -90,23 +90,23 @@ boot.loader.efi.canTouchEfiVariables = true; console.keyMap = "sv-latin1"; - systemd.services.vdirsyncer = { - serviceConfig.Type = "oneshot"; - serviceConfig.User = "fw"; - path = with pkgs; [ vdirsyncer ]; - script = '' - vdirsyncer -c "/home/fw/.config/vdirsyncer/config" sync - ''; - }; - systemd.timers.vdirsyncer = { - wantedBy = [ "timers.target" ]; - partOf = [ "vdirsyncer.service" ]; - timerConfig = { - OnBootSec = "5m"; - OnUnitActiveSec = "5m"; - Unit = "vdirsyncer.service"; - }; - }; + # systemd.services.vdirsyncer = { + # serviceConfig.Type = "oneshot"; + # serviceConfig.User = "fw"; + # path = with pkgs; [ vdirsyncer ]; + # script = '' + # vdirsyncer -c "/home/fw/.config/vdirsyncer/config" sync + # ''; + # }; + # systemd.timers.vdirsyncer = { + # wantedBy = [ "timers.target" ]; + # partOf = [ "vdirsyncer.service" ]; + # timerConfig = { + # OnBootSec = "5m"; + # OnUnitActiveSec = "5m"; + # Unit = "vdirsyncer.service"; + # }; + # }; environment.systemPackages = [( pkgs.catppuccin-sddm.override { diff --git a/config/home.nix b/config/home.nix index 5f9e54c..b2e593e 100644 --- a/config/home.nix +++ b/config/home.nix @@ -76,14 +76,28 @@ xorg.xmodmap playerctl openssl + libiconv + pkg-config libsecret + go + ghorg + libsixel + kompose #Terminal + weechat + jira-cli-go + texliveSmall + jq + + vscode + sc-im gnuplot bison vdirsyncer + todoist todoman calcure python311Packages.urwid @@ -117,10 +131,10 @@ azuredatastudio adrs opentofu - kubernetes lazydocker #Desktop + openvpn3 aerc firefox thunderbird @@ -171,6 +185,7 @@ nodePackages_latest.vls nodePackages_latest.volar vscode-langservers-extracted + gopls #VPN openvpn @@ -183,7 +198,7 @@ programs.fish.enable = true; xsession.enable = true; - xsession.windowManager.command = if myhostname == "laptop" then "/home/fw/nix/.xinitrc.laptop" else "/home/fw/nix/.xinitrc"; + xsession.windowManager.command = if myhostname == "laptop" then "/home/fw/nix/.xinitrc.laptop" else if myhostname == "jobb" then "/home/fw/nix/.xinitrc.jobb" else "/home/fw/nix/.xinitrc"; home.username = "fw"; home.homeDirectory = "/home/fw"; diff --git a/maskiner/desktop/configuration.nix b/maskiner/desktop/configuration.nix index 0ec86cc..7e12414 100644 --- a/maskiner/desktop/configuration.nix +++ b/maskiner/desktop/configuration.nix @@ -27,6 +27,7 @@ networking.firewall = { { from = 8000; to = 8010; } ]; }; + networking.firewall.allowedUDPPorts = [ 22000 21027 ]; services = { diff --git a/maskiner/jobb/configuration.nix b/maskiner/jobb/configuration.nix index 2d56b82..edf4902 100644 --- a/maskiner/jobb/configuration.nix +++ b/maskiner/jobb/configuration.nix @@ -16,34 +16,37 @@ ]; networking.hostName = myhostname; - networking.firewall = { - enable = true; - allowedTCPPorts = [ 80 443 8384 22000]; - }; - networking.firewall.allowedUDPPorts = [ 22000 21027 ]; - services = { - syncthing = { - enable = true; - user = "fw"; - dataDir = "/home/fw/syncthing"; - configDir = "/home/fw/.config/syncthing"; - overrideDevices = true; # overrides any devices added or deleted through the WebUI - overrideFolders = true; # overrides any folders added or deleted through the WebUI - guiAddress = "0.0.0.0:8384"; - settings = { - devices = { - "desktop" = { id = "BGEQVAA-JZM7DQB-7NFEDQ6-K7Q3HQL-P6OSNJ2-TMA3N7B-E6RP3HQ-OAMWJQL"; }; - "laptop" = { id = "2VEN7O3-PB3G2MK-XJI7R5Z-6MHTNN2-WMXERIX-6G7QWSK-VKSWOSH-Q5WFDAI"; }; - }; - folders = { - "Documents" = { # Name of folder in Syncthing, also the folder ID - path = "/home/fw/docs"; # Which folder to add to Syncthing - devices = [ "desktop" ]; # Which devices to share the folder with - }; - }; - }; - }; - }; + + services.k3s = { + enable = true; + role = "server"; + token = "supersupersecretkey"; + clusterInit = true; + }; + + # services = { + # syncthing = { + # enable = true; + # user = "fw"; + # dataDir = "/home/fw/syncthing"; + # configDir = "/home/fw/.config/syncthing"; + # overrideDevices = true; # overrides any devices added or deleted through the WebUI + # overrideFolders = true; # overrides any folders added or deleted through the WebUI + # guiAddress = "0.0.0.0:8384"; + # settings = { + # devices = { + # "desktop" = { id = "BGEQVAA-JZM7DQB-7NFEDQ6-K7Q3HQL-P6OSNJ2-TMA3N7B-E6RP3HQ-OAMWJQL"; }; + # "laptop" = { id = "2VEN7O3-PB3G2MK-XJI7R5Z-6MHTNN2-WMXERIX-6G7QWSK-VKSWOSH-Q5WFDAI"; }; + # }; + # folders = { + # "Documents" = { # Name of folder in Syncthing, also the folder ID + # path = "/home/fw/docs"; # Which folder to add to Syncthing + # devices = [ "desktop" ]; # Which devices to share the folder with + # }; + # }; + # }; + # }; + # }; services.xserver.dpi = 140; diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix index 7209f41..46cd0c1 100644 --- a/maskiner/laptop/configuration.nix +++ b/maskiner/laptop/configuration.nix @@ -17,6 +17,11 @@ networking.hostName = myhostname; + environment.systemPackages = with pkgs; [ + dotnet-sdk_8 + ]; + + services.xserver.dpi = 140; services = { syncthing = { diff --git a/shared/fish.nix b/shared/fish.nix index d088ed6..e0665b4 100644 --- a/shared/fish.nix +++ b/shared/fish.nix @@ -43,9 +43,18 @@ dev="nix develop --command fish"; spot="steam-run ~/program/spotify_player"; sc="sc-im"; + e="nvim"; + c="ssh"; + home="home-manager switch --flake $HM_DIR"; + reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR"; + cam="jira issue create && jira issue assign && jira issue move"; }; interactiveShellInit = '' set fish_greeting # Disable greeting + set FLAKE_DIR "/home/fw/nix" + set HM_DIR "$FLAKE_DIR#fw@jobb" + set SYSTEM_DIR "$FLAKE_DIR#jobb" + set GOPRIVATE "github.com/iFacts" # Macchiato set -Ux FZF_DEFAULT_OPTS "--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4" @@ -54,6 +63,7 @@ # --color=bg+:#ccd0da,bg:#eff1f5,spinner:#dc8a78,hl:#d20f39 \ # --color=fg:#4c4f69,header:#d20f39,info:#8839ef,pointer:#dc8a78 \ # --color=marker:#dc8a78,fg+:#4c4f69,prompt:#8839ef,hl+:#d20f39" + fish_add_path /home/fw/.cargo/bin ''; }; } diff --git a/shared/git.nix b/shared/git.nix index 9f8bfcc..4470f24 100644 --- a/shared/git.nix +++ b/shared/git.nix @@ -4,5 +4,8 @@ enable = true; userName = "FredzyW"; userEmail = "fredrik@wastring.com"; + extraConfig = { + url."git@github.com:".insteadOf = "https://github.com/"; + }; }; } diff --git a/shared/kitty.nix b/shared/kitty.nix index 786138f..dc6a322 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -13,7 +13,8 @@ mode = "no-cursor"; }; # theme = "Catppuccin-Latte"; - theme = "Catppuccin-Macchiato"; + theme = "Catppuccin-Mocha"; + # theme = "Catppuccin-Macchiato"; settings = { confirm_os_window_close = 2; cursor_shape = "block"; diff --git a/shared/ssh.nix b/shared/ssh.nix index ec12ced..dc61c3c 100644 --- a/shared/ssh.nix +++ b/shared/ssh.nix @@ -50,6 +50,18 @@ user = "github"; identityFile = "/home/fw/.ssh/github-ssh-key"; }; + "backup1" = { + hostname = "192.168.0.220"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/fw-ssh-key"; + }; + "dashboard" = { + hostname = "192.168.0.159"; + port = 22; + user = "fw"; + identityFile = "/home/fw/.ssh/fw-ssh-key"; + }; }; }; }