fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
fwastring 2024-11-28 13:06:58 +01:00
commit 8a3c9f593b
11 changed files with 109 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

49
config/base.nix
View file

@ -22,7 +22,7 @@
nix.nixPath = ["/etc/nix/path"]; nix.nixPath = ["/etc/nix/path"];
users.defaultUserShell = pkgs.bash; users.defaultUserShell = pkgs.bash;
documentation.man.generateCaches = false; 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.fish.enable = true;
programs.bash = { programs.bash = {
interactiveShellInit = '' interactiveShellInit = ''
@ -76,10 +76,9 @@
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
(nerdfonts.override { (nerdfonts.override {
fonts = [ fonts = [
"ComicShannsMono"
"FiraCode" "FiraCode"
"Agave" "Iosevka"
"VictorMono"
"DroidSansMono"
]; ];
}) })
]; ];
@ -98,8 +97,18 @@
LC_TIME = "sv_SE.UTF-8"; LC_TIME = "sv_SE.UTF-8";
}; };
boot.loader.systemd-boot.enable = true; # boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; # boot.loader.efi.canTouchEfiVariables = true;
boot.loader = {
efi = {
canTouchEfiVariables = false;
};
grub = {
efiSupport = true;
efiInstallAsRemovable = true;
device = "nodev";
};
};
console.keyMap = "sv-latin1"; console.keyMap = "sv-latin1";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -110,15 +119,15 @@
nano nano
git git
openssh openssh
( # (
catppuccin-sddm.override { # catppuccin-sddm.override {
flavor = "mocha"; # flavor = "mocha";
font = "FiraCode Nerd Font Bold"; # font = "ComicShannsMono Nerd Font Bold";
fontSize = "17"; # fontSize = "17";
background = "${../wallpapers/inverted.png}"; # background = "${../wallpapers/inverted.png}";
loginBackground = true; # loginBackground = true;
} # }
) # )
]; ];
@ -139,14 +148,10 @@
"ipsec.d/ipsec.nm-l2tp.secrets" "ipsec.d/ipsec.nm-l2tp.secrets"
]; ];
}; };
displayManager = {
sddm = {
enable = true;
theme = "catppuccin-mocha";
package = pkgs.kdePackages.sddm;
};
};
xserver = { xserver = {
displayManager = {
startx.enable = true;
};
enable = true; enable = true;
xkb = { xkb = {
layout = "se"; layout = "se";

20
config/home.nix
View file

@ -10,6 +10,7 @@
}: { }: {
imports = [ imports = [
../shared/dwm.nix ../shared/dwm.nix
../shared/vscode.nix
../shared/dmenu.nix ../shared/dmenu.nix
../shared/rofi.nix ../shared/rofi.nix
../shared/kitty.nix ../shared/kitty.nix
@ -77,8 +78,14 @@
btop btop
xcolor xcolor
beets beets
openssl
# Dev # Dev
kaggle
unstable.cargo
unstable.rustc
cargo-generate
nodejs_22
gleam gleam
gh-f gh-f
gh gh
@ -94,16 +101,25 @@
ranger ranger
tesseract4 tesseract4
k9s k9s
kubectl
ngrok
graphviz
#LSP #LSP
yaml-language-server
nil nil
jdt-language-server jdt-language-server
texlab texlab
marksman marksman
nodePackages_latest.bash-language-server nodePackages_latest.bash-language-server
typescript
nodePackages_latest.typescript-language-server
nodePackages_latest.vls
nodePackages_latest.volar
lua-language-server lua-language-server
tree-sitter tree-sitter
gopls gopls
rust-analyzer
# Geography # Geography
geos geos
@ -111,6 +127,8 @@
# UI # UI
rofi-bluetooth rofi-bluetooth
pastel pastel
unstable.rmpc
mpd
imagemagick imagemagick
#VPN #VPN
@ -134,6 +152,8 @@
poppler_utils poppler_utils
#Desktop #Desktop
unstable.signal-desktop
kompare
pinta pinta
zathura zathura
firefox firefox

178
flake.lock generated
View file

@ -1,46 +1,12 @@
{ {
"nodes": { "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": { "fw-pkgs": {
"locked": { "locked": {
"lastModified": 1717322328, "lastModified": 1730710113,
"narHash": "sha256-Kb45yu6RgfTgtcwaj3eme5k/zjh3W3Gw5ACl7/OBYmw=", "narHash": "sha256-6DtfJyoScSuTKVjPH8INHACl/7qX3OqbA61UI2u5a1c=",
"owner": "fwastring", "owner": "fwastring",
"repo": "fwpkgs", "repo": "fwpkgs",
"rev": "f9d01269a520872f15f5e30f286616261821b158", "rev": "fb322b3c8c413c3bd4d5222fe4b9566ab2998c58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,22 +16,6 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -73,11 +23,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717527182, "lastModified": 1726989464,
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "845a5c4c073f74105022533907703441e0464bc3", "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,67 +37,13 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1720928027, "lastModified": 1730327045,
"narHash": "sha256-Ze8frbrRJAuEJWVWf9bExMoFshPYhAmp1Nq5VYkzlVU=", "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
"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=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "rev": "080166c15633801df010977d9d7474b4a6c549d7",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,61 +53,29 @@
"type": "github" "type": "github"
} }
}, },
"pugixml-src": { "nixpkgs-unstable": {
"flake": false,
"locked": { "locked": {
"lastModified": 1720456557, "lastModified": 1730531603,
"narHash": "sha256-0KZgn1PASbEb+Xl9XDZI+uifWwKPL6pVC1Lgbnjbet0=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"ref": "refs/heads/master", "owner": "NixOS",
"rev": "30cc354fe37114ec7a0a4ed2192951690357c2ed", "repo": "nixpkgs",
"revCount": 1799, "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "git", "type": "github"
"url": "https://github.com/zeux/pugixml"
}, },
"original": { "original": {
"type": "git", "owner": "NixOS",
"url": "https://github.com/zeux/pugixml" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"fw-pkgs": "fw-pkgs", "fw-pkgs": "fw-pkgs",
"home-manager": "home-manager", "home-manager": "home-manager",
"knock": "knock", "nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "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", "root": "root",

11
maskiner/laptop/configuration.nix
View file

@ -21,6 +21,17 @@
dotnet-sdk_8 dotnet-sdk_8
]; ];
# boot.loader = {
# efi = {
# canTouchEfiVariables = true;
# };
# grub = {
# enable = true;
# efiSupport = true;
# useOSProber = true;
# };
# };
services.xserver.dpi = 140; services.xserver.dpi = 140;

11
maskiner/server/configuration.nix
View file

@ -67,6 +67,7 @@
(nerdfonts.override { (nerdfonts.override {
fonts = [ fonts = [
"FiraCode" "FiraCode"
"Iosevka"
"DroidSansMono" "DroidSansMono"
]; ];
}) })
@ -86,11 +87,11 @@
LC_TIME = "sv_SE.UTF-8"; LC_TIME = "sv_SE.UTF-8";
}; };
boot.loader.grub = { # boot.loader.grub = {
enable = true; # enable = true;
device = "/dev/sdc"; # device = "/dev/sdc";
useOSProber = true; # useOSProber = true;
}; # };
console.keyMap = "sv-latin1"; console.keyMap = "sv-latin1";
programs.zsh.enable = true; programs.zsh.enable = true;

2
shared/dwm.nix
View file

@ -3,7 +3,7 @@ let
dwm = pkgs.dwm.overrideAttrs (old: { dwm = pkgs.dwm.overrideAttrs (old: {
src = builtins.fetchGit { src = builtins.fetchGit {
url = "https://github.com/FredzyW/dwm-conf.git"; url = "https://github.com/FredzyW/dwm-conf.git";
rev = "48302683403ca7457590c0a55c73ab5cc7e4113a"; rev = "3b9d96ece2c814a1c50d59de68587b2a4eee4ff8";
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
xorg.libX11.dev xorg.libX11.dev

4
shared/fish.nix
View file

@ -48,7 +48,9 @@
home="home-manager switch --flake $HM_DIR"; home="home-manager switch --flake $HM_DIR";
reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR"; reb="sudo nixos-rebuild switch --flake $SYSTEM_DIR";
cam="jira issue create && jira issue assign && jira issue move"; 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";
vpnup="nmcli con up 'iFacts VPN'";
vpndown="nmcli con down 'iFacts VPN'";
}; };
interactiveShellInit = '' interactiveShellInit = ''
fish_vi_key_bindings fish_vi_key_bindings

10
shared/kitty.nix
View file

@ -3,18 +3,18 @@
programs.kitty = { programs.kitty = {
enable = true; enable = true;
font = if myhostname == "laptop" then { font = if myhostname == "laptop" then {
name = "FiraCode Nerd Font Bold"; # name = "Iosevka Nerd Font Bold";
size = 24; name = "ComicShannsMono Nerd Font Bold";
size = 20;
} else { } else {
name = "FiraCode Nerd Font Bold"; # name = "Iosevka Nerd Font Bold";
name = "ComicShannsMono Nerd Font Bold";
size = 13; size = 13;
}; };
shellIntegration = { shellIntegration = {
mode = "no-cursor"; mode = "no-cursor";
}; };
# theme = "Catppuccin-Latte";
theme = "Catppuccin-Mocha"; theme = "Catppuccin-Mocha";
# theme = "Catppuccin-Macchiato";
settings = { settings = {
confirm_os_window_close = 2; confirm_os_window_close = 2;
cursor_shape = "block"; cursor_shape = "block";

17
shared/ssh.nix
View file

@ -19,15 +19,16 @@
hostname = "login.student.lth.se"; hostname = "login.student.lth.se";
port = 22; port = 22;
user = "fr7658wa-s"; user = "fr7658wa-s";
identityFile = "/home/fw/.ssh/id_rsa";
}; };
"dm2" = { "dm2" = {
hostname = "docker-master2"; hostname = "192.168.0.190";
port = 22; port = 22;
user = "fw"; user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key"; identityFile = "/home/fw/.ssh/fw-ssh-key";
}; };
"ha1" = { "ha1" = {
hostname = "hosted-agent-1"; hostname = "192.168.0.180";
port = 22; port = 22;
user = "fw"; user = "fw";
identityFile = "/home/fw/.ssh/fw-ssh-key"; identityFile = "/home/fw/.ssh/fw-ssh-key";
@ -62,18 +63,6 @@
user = "github"; user = "github";
identityFile = "/home/fw/.ssh/github-ssh-key"; 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" = { "malmo" = {
hostname = "192.168.0.138"; hostname = "192.168.0.138";
port = 22; port = 22;

1
shared/tmux.nix
View file

@ -25,6 +25,7 @@
''; '';
} }
fw-pkgs.tmuxPlugins.spotify fw-pkgs.tmuxPlugins.spotify
fw-pkgs.tmuxPlugins.tmux-fzf-window
{ {
plugin = fw-pkgs.tmuxPlugins.minimal; plugin = fw-pkgs.tmuxPlugins.minimal;
extraConfig = '' extraConfig = ''

11
shared/vscode.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
programs.vscode = {
enable = true;
extensions = with pkgs.vscode-extensions; [
vscodevim.vim
jebbs.plantuml
];
};
}