From 41387bf18d4f35145a7d2f5c4da5d8f91a4eb747 Mon Sep 17 00:00:00 2001 From: FredzyW Date: Fri, 8 Nov 2024 09:41:12 +0100 Subject: [PATCH 1/5] IPs --- shared/ssh.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/shared/ssh.nix b/shared/ssh.nix index 0537ab8..c36f30c 100644 --- a/shared/ssh.nix +++ b/shared/ssh.nix @@ -21,7 +21,7 @@ user = "fr7658wa-s"; }; "dm2" = { - hostname = "docker-master2"; + hostname = "192.168.0.190"; port = 22; user = "fw"; identityFile = "/home/fw/.ssh/fw-ssh-key"; @@ -62,18 +62,6 @@ 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"; - }; "malmo" = { hostname = "192.168.0.138"; port = 22; From 6c1838ede0001bd5cf4310e9124d07af23badd88 Mon Sep 17 00:00:00 2001 From: FredzyW Date: Mon, 11 Nov 2024 16:15:26 +0100 Subject: [PATCH 2/5] Lots of changes --- config/base.nix | 7 +- config/home.nix | 15 +++ flake.lock | 178 ++++-------------------------- maskiner/server/configuration.nix | 1 + shared/dwm.nix | 2 +- shared/fish.nix | 2 +- shared/kitty.nix | 10 +- shared/tmux.nix | 1 + 8 files changed, 48 insertions(+), 168 deletions(-) diff --git a/config/base.nix b/config/base.nix index e3d647f..6a28542 100644 --- a/config/base.nix +++ b/config/base.nix @@ -76,10 +76,9 @@ fonts.packages = with pkgs; [ (nerdfonts.override { fonts = [ + "ComicShannsMono" "FiraCode" - "Agave" - "VictorMono" - "DroidSansMono" + "Iosevka" ]; }) ]; @@ -107,7 +106,7 @@ ( catppuccin-sddm.override { flavor = "mocha"; - font = "FiraCode Nerd Font Bold"; + font = "ComicShannsMono Nerd Font Bold"; fontSize = "17"; background = "${../wallpapers/inverted.png}"; loginBackground = true; diff --git a/config/home.nix b/config/home.nix index 3a0637b..3270522 100644 --- a/config/home.nix +++ b/config/home.nix @@ -76,8 +76,13 @@ eza btop xcolor + openssl # Dev + unstable.cargo + unstable.rustc + cargo-generate + nodejs_22 gleam gh-f gh @@ -93,16 +98,24 @@ ranger tesseract4 k9s + kubectl + ngrok #LSP + yaml-language-server nil jdt-language-server texlab marksman nodePackages_latest.bash-language-server + typescript + nodePackages_latest.typescript-language-server + nodePackages_latest.vls + nodePackages_latest.volar lua-language-server tree-sitter gopls + rust-analyzer # Geography geos @@ -133,6 +146,8 @@ poppler_utils #Desktop + unstable.signal-desktop + kompare pinta zathura firefox diff --git a/flake.lock b/flake.lock index 6835ee4..ce3e909 100644 --- a/flake.lock +++ b/flake.lock @@ -1,46 +1,12 @@ { "nodes": { - "base64-src": { - "flake": false, - "locked": { - "lastModified": 1705041416, - "narHash": "sha256-fi1/gozIXtVAhJr/TOM5cu1hJ7BKgz4KaDtkbYNKYR0=", - "ref": "refs/heads/master", - "rev": "dceb7af2f73afb7aae20322cca04f27331d2e16a", - "revCount": 3, - "type": "git", - "url": "https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594" - }, - "original": { - "type": "git", - "url": "https://gist.github.com/tomykaira/f0fd86b6c73063283afe550bc5d77594" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "ref": "refs/heads/main", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "revCount": 92, - "type": "git", - "url": "https://github.com/numtide/flake-utils" - }, - "original": { - "type": "git", - "url": "https://github.com/numtide/flake-utils" - } - }, "fw-pkgs": { "locked": { - "lastModified": 1717322328, - "narHash": "sha256-Kb45yu6RgfTgtcwaj3eme5k/zjh3W3Gw5ACl7/OBYmw=", + "lastModified": 1730710113, + "narHash": "sha256-6DtfJyoScSuTKVjPH8INHACl/7qX3OqbA61UI2u5a1c=", "owner": "fwastring", "repo": "fwpkgs", - "rev": "f9d01269a520872f15f5e30f286616261821b158", + "rev": "fb322b3c8c413c3bd4d5222fe4b9566ab2998c58", "type": "github" }, "original": { @@ -50,22 +16,6 @@ "type": "github" } }, - "gourou-src": { - "flake": false, - "locked": { - "lastModified": 1713159448, - "narHash": "sha256-z/hMvFPDd3CXo4iUiZPfkUVQPPcJe+Tk6By+cibAtE0=", - "ref": "refs/heads/master", - "rev": "81faf1f9bef4d27d8659f2f16b9c65df227ee3d7", - "revCount": 141, - "type": "git", - "url": "https://forge.soutade.fr/soutade/libgourou" - }, - "original": { - "type": "git", - "url": "https://forge.soutade.fr/soutade/libgourou" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -73,11 +23,11 @@ ] }, "locked": { - "lastModified": 1717527182, - "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "845a5c4c073f74105022533907703441e0464bc3", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -87,67 +37,13 @@ "type": "github" } }, - "knock": { - "inputs": { - "base64-src": "base64-src", - "flake-utils": "flake-utils", - "gourou-src": "gourou-src", - "nixpkgs": "nixpkgs", - "pugixml-src": "pugixml-src", - "updfparser-src": "updfparser-src" - }, - "locked": { - "lastModified": 1721181121, - "narHash": "sha256-181wtuVI4l6mWUMwDe0HkvoqKWrDF+UVL0E83YEztks=", - "owner": "BentonEdmondson", - "repo": "knock", - "rev": "0aa4005fd4f2ee1b41c20643017c8f0a2bdf6262", - "type": "github" - }, - "original": { - "owner": "BentonEdmondson", - "repo": "knock", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1720928027, - "narHash": "sha256-Ze8frbrRJAuEJWVWf9bExMoFshPYhAmp1Nq5VYkzlVU=", - "ref": "refs/heads/master", - "rev": "048f85c494ef4fcd90889537f78e8548f5abcaf0", - "revCount": 652811, - "type": "git", - "url": "https://github.com/nixos/nixpkgs" - }, - "original": { - "type": "git", - "url": "https://github.com/nixos/nixpkgs" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "lastModified": 1730327045, + "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "rev": "080166c15633801df010977d9d7474b4a6c549d7", "type": "github" }, "original": { @@ -157,61 +53,29 @@ "type": "github" } }, - "pugixml-src": { - "flake": false, + "nixpkgs-unstable": { "locked": { - "lastModified": 1720456557, - "narHash": "sha256-0KZgn1PASbEb+Xl9XDZI+uifWwKPL6pVC1Lgbnjbet0=", - "ref": "refs/heads/master", - "rev": "30cc354fe37114ec7a0a4ed2192951690357c2ed", - "revCount": 1799, - "type": "git", - "url": "https://github.com/zeux/pugixml" + "lastModified": 1730531603, + "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "type": "github" }, "original": { - "type": "git", - "url": "https://github.com/zeux/pugixml" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "root": { "inputs": { "fw-pkgs": "fw-pkgs", "home-manager": "home-manager", - "knock": "knock", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "updfparser-src": { - "flake": false, - "locked": { - "lastModified": 1711214903, - "narHash": "sha256-HD73WGZ4e/3T7vQmwU/lRADtvsInFG62uqvJmF773Rk=", - "ref": "refs/heads/master", - "rev": "6060d123441a06df699eb275ae5ffdd50409b8f3", - "revCount": 33, - "type": "git", - "url": "https://forge.soutade.fr/soutade/updfparser" - }, - "original": { - "type": "git", - "url": "https://forge.soutade.fr/soutade/updfparser" - } } }, "root": "root", diff --git a/maskiner/server/configuration.nix b/maskiner/server/configuration.nix index 93a9c78..4b18dcc 100644 --- a/maskiner/server/configuration.nix +++ b/maskiner/server/configuration.nix @@ -67,6 +67,7 @@ (nerdfonts.override { fonts = [ "FiraCode" + "Iosevka" "DroidSansMono" ]; }) diff --git a/shared/dwm.nix b/shared/dwm.nix index 337bf48..2927e79 100644 --- a/shared/dwm.nix +++ b/shared/dwm.nix @@ -3,7 +3,7 @@ let dwm = pkgs.dwm.overrideAttrs (old: { src = builtins.fetchGit { url = "https://github.com/FredzyW/dwm-conf.git"; - rev = "48302683403ca7457590c0a55c73ab5cc7e4113a"; + rev = "3b9d96ece2c814a1c50d59de68587b2a4eee4ff8"; }; nativeBuildInputs = with pkgs; [ xorg.libX11.dev diff --git a/shared/fish.nix b/shared/fish.nix index ec3f358..7272d33 100644 --- a/shared/fish.nix +++ b/shared/fish.nix @@ -48,7 +48,7 @@ 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"; - latest="git log | head -1 | awk '{print $2;}' | xsel -i"; + latest="git log | head -1 | awk '{print $2;}' | xsel -ib"; }; interactiveShellInit = '' fish_vi_key_bindings diff --git a/shared/kitty.nix b/shared/kitty.nix index b6e0d61..f9277de 100644 --- a/shared/kitty.nix +++ b/shared/kitty.nix @@ -3,18 +3,18 @@ programs.kitty = { enable = true; font = if myhostname == "laptop" then { - name = "FiraCode Nerd Font Bold"; - size = 24; + # name = "Iosevka Nerd Font Bold"; + name = "ComicShannsMono Nerd Font Bold"; + size = 20; } else { - name = "FiraCode Nerd Font Bold"; + # name = "Iosevka Nerd Font Bold"; + name = "ComicShannsMono Nerd Font Bold"; size = 13; }; shellIntegration = { mode = "no-cursor"; }; - # theme = "Catppuccin-Latte"; theme = "Catppuccin-Mocha"; - # theme = "Catppuccin-Macchiato"; settings = { confirm_os_window_close = 2; cursor_shape = "block"; diff --git a/shared/tmux.nix b/shared/tmux.nix index fd83916..1e42fcc 100644 --- a/shared/tmux.nix +++ b/shared/tmux.nix @@ -25,6 +25,7 @@ ''; } fw-pkgs.tmuxPlugins.spotify + fw-pkgs.tmuxPlugins.tmux-fzf-window { plugin = fw-pkgs.tmuxPlugins.minimal; extraConfig = '' From 5190de97d695829801cde8859960275576b2ee8c Mon Sep 17 00:00:00 2001 From: FredzyW Date: Fri, 15 Nov 2024 09:23:13 +0100 Subject: [PATCH 3/5] Fixed booloader and more --- config/base.nix | 44 ++++++++++++++++++------------- config/home.nix | 2 ++ maskiner/laptop/configuration.nix | 11 ++++++++ maskiner/server/configuration.nix | 10 +++---- shared/fish.nix | 2 ++ shared/ssh.nix | 3 ++- 6 files changed, 47 insertions(+), 25 deletions(-) diff --git a/config/base.nix b/config/base.nix index 6a28542..4ed0648 100644 --- a/config/base.nix +++ b/config/base.nix @@ -22,7 +22,7 @@ nix.nixPath = ["/etc/nix/path"]; users.defaultUserShell = pkgs.bash; documentation.man.generateCaches = false; - systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; + # systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; programs.fish.enable = true; programs.bash = { interactiveShellInit = '' @@ -97,21 +97,31 @@ LC_TIME = "sv_SE.UTF-8"; }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + # boot.loader.systemd-boot.enable = true; + # boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + efi = { + canTouchEfiVariables = false; + }; + grub = { + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; + }; console.keyMap = "sv-latin1"; environment.systemPackages = with pkgs; [ openssh - ( - catppuccin-sddm.override { - flavor = "mocha"; - font = "ComicShannsMono Nerd Font Bold"; - fontSize = "17"; - background = "${../wallpapers/inverted.png}"; - loginBackground = true; - } - ) + # ( + # catppuccin-sddm.override { + # flavor = "mocha"; + # font = "ComicShannsMono Nerd Font Bold"; + # fontSize = "17"; + # background = "${../wallpapers/inverted.png}"; + # loginBackground = true; + # } + # ) ]; @@ -132,14 +142,10 @@ "ipsec.d/ipsec.nm-l2tp.secrets" ]; }; - displayManager = { - sddm = { - enable = true; - theme = "catppuccin-mocha"; - package = pkgs.kdePackages.sddm; - }; - }; xserver = { + displayManager = { + startx.enable = true; + }; enable = true; xkb = { layout = "se"; diff --git a/config/home.nix b/config/home.nix index 3270522..fe46fe6 100644 --- a/config/home.nix +++ b/config/home.nix @@ -79,6 +79,8 @@ openssl # Dev + kaggle + vscode unstable.cargo unstable.rustc cargo-generate diff --git a/maskiner/laptop/configuration.nix b/maskiner/laptop/configuration.nix index 7a02fbf..539bc8d 100644 --- a/maskiner/laptop/configuration.nix +++ b/maskiner/laptop/configuration.nix @@ -21,6 +21,17 @@ dotnet-sdk_8 ]; + # boot.loader = { + # efi = { + # canTouchEfiVariables = true; + # }; + # grub = { + # enable = true; + # efiSupport = true; + # useOSProber = true; + # }; + # }; + services.xserver.dpi = 140; diff --git a/maskiner/server/configuration.nix b/maskiner/server/configuration.nix index 4b18dcc..2dc64ad 100644 --- a/maskiner/server/configuration.nix +++ b/maskiner/server/configuration.nix @@ -87,11 +87,11 @@ LC_TIME = "sv_SE.UTF-8"; }; - boot.loader.grub = { - enable = true; - device = "/dev/sdc"; - useOSProber = true; - }; + # boot.loader.grub = { + # enable = true; + # device = "/dev/sdc"; + # useOSProber = true; + # }; console.keyMap = "sv-latin1"; programs.zsh.enable = true; diff --git a/shared/fish.nix b/shared/fish.nix index 7272d33..28e4d84 100644 --- a/shared/fish.nix +++ b/shared/fish.nix @@ -49,6 +49,8 @@ reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR"; cam="jira issue create && jira issue assign && jira issue move"; latest="git log | head -1 | awk '{print $2;}' | xsel -ib"; + vpnup="nmcli con up 'iFacts VPN'"; + vpndown="nmcli con down 'iFacts VPN'"; }; interactiveShellInit = '' fish_vi_key_bindings diff --git a/shared/ssh.nix b/shared/ssh.nix index c36f30c..f76f719 100644 --- a/shared/ssh.nix +++ b/shared/ssh.nix @@ -19,6 +19,7 @@ hostname = "login.student.lth.se"; port = 22; user = "fr7658wa-s"; + identityFile = "/home/fw/.ssh/id_rsa"; }; "dm2" = { hostname = "192.168.0.190"; @@ -27,7 +28,7 @@ identityFile = "/home/fw/.ssh/fw-ssh-key"; }; "ha1" = { - hostname = "hosted-agent-1"; + hostname = "192.168.0.180"; port = 22; user = "fw"; identityFile = "/home/fw/.ssh/fw-ssh-key"; From d272c65aedce8ecc1490435cfa027e37493ca6bf Mon Sep 17 00:00:00 2001 From: FredzyW Date: Tue, 19 Nov 2024 10:35:36 +0100 Subject: [PATCH 4/5] Added vscode --- shared/vscode.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 shared/vscode.nix diff --git a/shared/vscode.nix b/shared/vscode.nix new file mode 100644 index 0000000..81ad387 --- /dev/null +++ b/shared/vscode.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +{ + programs.vscode = { + enable = true; + extensions = with pkgs.vscode-extensions; [ + vscodevim.vim + jebbs.plantuml + ]; + }; + +} From cd3382f776f5ba2020fc28ae3fc511c1381f9996 Mon Sep 17 00:00:00 2001 From: FredzyW Date: Tue, 19 Nov 2024 10:35:41 +0100 Subject: [PATCH 5/5] Changed vscode --- config/home.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/home.nix b/config/home.nix index fe46fe6..fac4e47 100644 --- a/config/home.nix +++ b/config/home.nix @@ -10,6 +10,7 @@ }: { imports = [ ../shared/dwm.nix + ../shared/vscode.nix ../shared/dmenu.nix ../shared/rofi.nix ../shared/kitty.nix @@ -80,7 +81,6 @@ # Dev kaggle - vscode unstable.cargo unstable.rustc cargo-generate @@ -102,6 +102,7 @@ k9s kubectl ngrok + graphviz #LSP yaml-language-server @@ -125,6 +126,8 @@ # UI rofi-bluetooth pastel + unstable.rmpc + mpd imagemagick #VPN