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

Merge

Browse source
This commit is contained in:
FredzyW 2024-09-24 09:00:02 +02:00
commit 57a345b46d
11 changed files with 242 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

23
config/base.nix
View file

@ -21,6 +21,7 @@
nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs); nix.registry = (lib.mapAttrs (_: flake: {inherit flake;})) ((lib.filterAttrs (_: lib.isType "flake")) inputs);
nix.nixPath = ["/etc/nix/path"]; nix.nixPath = ["/etc/nix/path"];
users.defaultUserShell = pkgs.bash; users.defaultUserShell = pkgs.bash;
documentation.man.generateCaches = false;
# environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
# ]; # ];
systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; systemd.services.NetworkManager-wait-online.enable = lib.mkForce false;
@ -57,6 +58,11 @@
bluetooth = { bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;
settings = {
General = {
Disable="Headset";
};
};
}; };
}; };
@ -96,6 +102,9 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# boot.extraModulePackages = [
# config.boot.kernelPackages.wireguard
# ];
console.keyMap = "sv-latin1"; console.keyMap = "sv-latin1";
# systemd.services.vdirsyncer = { # systemd.services.vdirsyncer = {
@ -116,7 +125,15 @@
# }; # };
# }; # };
environment.systemPackages = with pkgs; [( environment.systemPackages = with pkgs; [
# wireguard-go
pulsemixer
openssh
pinentry-curses
spotify-qt
wireguard-tools
(firefox.override { nativeMessagingHosts = [passff-host]; })
(
catppuccin-sddm.override { catppuccin-sddm.override {
flavor = "mocha"; flavor = "mocha";
font = "FiraCode Nerd Font Bold"; font = "FiraCode Nerd Font Bold";
@ -124,7 +141,8 @@
background = "${../wallpapers/inverted.png}"; background = "${../wallpapers/inverted.png}";
loginBackground = true; loginBackground = true;
} }
)]; )
];
services = { services = {
@ -134,6 +152,7 @@
via via
]; ];
}; };
picom.enable = true;
openssh = { openssh = {
enable = true; enable = true;
}; };

67
config/home.nix
View file

@ -22,16 +22,19 @@
../shared/firefox.nix ../shared/firefox.nix
../shared/zathura.nix ../shared/zathura.nix
../shared/lazygit.nix ../shared/lazygit.nix
../shared/spotifyd.nix # ../shared/spotifyd.nix
../shared/ssh.nix ../shared/ssh.nix
../shared/aerc.nix ../shared/aerc.nix
../shared/rbw.nix ../shared/rbw.nix
../shared/oh-my-posh.nix ../shared/oh-my-posh.nix
../shared/mpv.nix
]; ];
nixpkgs = { nixpkgs = {
overlays = []; overlays = [];
config = { config = {
# allowUnfree = false;
# allowUnfreePredicate = _: false;
allowUnfree = true; allowUnfree = true;
allowUnfreePredicate = _: true; allowUnfreePredicate = _: true;
permittedInsecurePackages = [ permittedInsecurePackages = [
@ -50,7 +53,6 @@
alsa-utils alsa-utils
killall killall
upower upower
mpv
gcc gcc
gnumake gnumake
htop htop
@ -71,7 +73,6 @@
pavucontrol pavucontrol
fd fd
bat bat
steam-run
appimage-run appimage-run
bluez bluez
bluez-tools bluez-tools
@ -85,33 +86,21 @@
go go
ghorg ghorg
libsixel libsixel
kompose valgrind
soulseekqt
#Terminal #Terminal
weechat
jira-cli-go
jq jq
vscode
sc-im
gnuplot gnuplot
bison
tesseract
qrencode qrencode
texliveMedium texliveFull
vdirsyncer
todoist
todoman
calcure
python311Packages.urwid python311Packages.urwid
signal-cli python311Packages.numpy
scli python311Packages.matplotlib
sysz sysz
betterlockscreen betterlockscreen
pyradio
haskellPackages.patat
gh gh
git git
tmux tmux
@ -119,7 +108,6 @@
yt-dlp yt-dlp
fzf fzf
ripgrep ripgrep
fw-pkgs.spotify-player
alsa-lib alsa-lib
libdbusmenu libdbusmenu
xorg.libxcb xorg.libxcb
@ -132,42 +120,39 @@
rustup rustup
openssl openssl
pkg-config pkg-config
azure-cli
azuredatastudio
adrs
opentofu
lazydocker lazydocker
#Unfree
# obsidian
# discord
# slack
#Alternatives
slack-cli
spotify
unstable.spotifyd
librespot
discordo
#Desktop #Desktop
openvpn3 libreoffice-qt6-fresh
fluent-reader
aerc aerc
firefox firefox
chromium
vial vial
thunderbird thunderbird
spotify signal-desktop-beta
signal-desktop
darktable
discord
discordo
slack
kitty kitty
alacritty alacritty
neovim unstable.neovim
fastfetch fastfetch
obsidian
lazygit lazygit
betterdiscordctl
pdfarranger pdfarranger
byzanz byzanz
drawio drawio
xdotool xdotool
pinentry pinentry
remmina remmina
rofi
rbw
rofi-rbw
teams-for-linux
#Dev #Dev
python3 python3
@ -175,6 +160,8 @@
ranger ranger
python311Packages.pynvim python311Packages.pynvim
ueberzugpp ueberzugpp
jdk
maven
#LSP #LSP
nil nil

1
config/users.nix
View file

@ -18,6 +18,7 @@
"wheel" "wheel"
"audio" "audio"
"docker" "docker"
"input"
]; ];
openssh.authorizedKeys = { openssh.authorizedKeys = {
keys = [ keys = [

164
flake.lock generated
View file

@ -1,5 +1,39 @@
{ {
"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": 1717322328,
@ -16,6 +50,22 @@
"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": [
@ -37,36 +87,42 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1718208800, "lastModified": 1721181121,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "narHash": "sha256-181wtuVI4l6mWUMwDe0HkvoqKWrDF+UVL0E83YEztks=",
"owner": "NixOS", "owner": "BentonEdmondson",
"repo": "nixpkgs", "repo": "knock",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "rev": "0aa4005fd4f2ee1b41c20643017c8f0a2bdf6262",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "BentonEdmondson",
"ref": "nixos-24.05", "repo": "knock",
"repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713638189, "lastModified": 1720928027,
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=", "narHash": "sha256-Ze8frbrRJAuEJWVWf9bExMoFshPYhAmp1Nq5VYkzlVU=",
"owner": "NixOS", "ref": "refs/heads/master",
"repo": "nixpkgs", "rev": "048f85c494ef4fcd90889537f78e8548f5abcaf0",
"rev": "74574c38577914733b4f7a775dd77d24245081dd", "revCount": 652811,
"type": "github" "type": "git",
"url": "https://github.com/nixos/nixpkgs"
}, },
"original": { "original": {
"owner": "NixOS", "type": "git",
"ref": "release-23.11", "url": "https://github.com/nixos/nixpkgs"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
@ -87,44 +143,74 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713596654, "lastModified": 1718208800,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"pugixml-src": {
"flake": false,
"locked": {
"lastModified": 1720456557,
"narHash": "sha256-0KZgn1PASbEb+Xl9XDZI+uifWwKPL6pVC1Lgbnjbet0=",
"ref": "refs/heads/master",
"rev": "30cc354fe37114ec7a0a4ed2192951690357c2ed",
"revCount": 1799,
"type": "git",
"url": "https://github.com/zeux/pugixml"
},
"original": {
"type": "git",
"url": "https://github.com/zeux/pugixml"
}
},
"root": { "root": {
"inputs": { "inputs": {
"fw-pkgs": "fw-pkgs", "fw-pkgs": "fw-pkgs",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "knock": "knock",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix" "nixpkgs-unstable": "nixpkgs-unstable"
} }
}, },
"sops-nix": { "systems": {
"inputs": {
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": { "locked": {
"lastModified": 1713892811, "lastModified": 1681028828,
"narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"path": "/nix/store/d0lnnw00mxa025i7dz4g4qcdfixxmg1s-source", "owner": "nix-systems",
"rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", "repo": "default",
"type": "path" "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
}, },
"original": { "original": {
"id": "sops-nix", "owner": "nix-systems",
"type": "indirect" "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"
} }
} }
}, },

18
flake.nix
View file

@ -6,6 +6,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
fw-pkgs.url = "github:fwastring/fwpkgs/main"; fw-pkgs.url = "github:fwastring/fwpkgs/main";
knock.url = "github:BentonEdmondson/knock";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.05";
@ -18,7 +19,7 @@
home-manager, home-manager,
nixpkgs-unstable, nixpkgs-unstable,
fw-pkgs, fw-pkgs,
sops-nix, knock,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs; inherit (self) outputs;
@ -26,13 +27,19 @@
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = false;
}; };
}; };
overlay-fw-pkgs = final: prev: { overlay-fw-pkgs = final: prev: {
fw-pkgs = import fw-pkgs { fw-pkgs = import fw-pkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = false;
};
};
overlay-knock = final: prev: {
knock = import knock {
inherit system;
config.allowUnfree = false;
}; };
}; };
in { in {
@ -46,7 +53,6 @@
}; };
modules = [ modules = [
./maskiner/laptop/configuration.nix ./maskiner/laptop/configuration.nix
sops-nix.nixosModules.sops
]; ];
}; };
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
@ -57,6 +63,7 @@
modules = [ modules = [
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./maskiner/desktop/configuration.nix ./maskiner/desktop/configuration.nix
knock
]; ];
}; };
jobb = nixpkgs.lib.nixosSystem { jobb = nixpkgs.lib.nixosSystem {
@ -79,8 +86,7 @@
}; };
modules = [ modules = [
./config/home.nix ./config/home.nix
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) ({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-unstable overlay-knock overlay-fw-pkgs ]; })
({nixpkgs, ... }: { nixpkgs.overlays = [ overlay-fw-pkgs ]; })
]; ];
}; };
"fw@desktop" = home-manager.lib.homeManagerConfiguration { "fw@desktop" = home-manager.lib.homeManagerConfiguration {

13
maskiner/laptop/configuration.nix
View file

@ -23,7 +23,20 @@
services.xserver.dpi = 140; services.xserver.dpi = 140;
services = { services = {
openssh = {
enable = true;
ports = [55504];
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
X11Forwarding = true;
};
extraConfig = ''
AllowUsers fw
'';
};
syncthing = { syncthing = {
enable = true; enable = true;
user = "fw"; user = "fw";

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 = "964a3b9c94e780636a1a4ef01afb90ab8de4bb6d"; rev = "696050185fa48575e53157e83d46ae0613733446";
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
xorg.libX11.dev xorg.libX11.dev

4
shared/fish.nix
View file

@ -39,7 +39,7 @@
]; ];
shellAbbrs = { shellAbbrs = {
homec="nvim ~/nix/config/home.nix"; homec="nvim ~/nix/config/home.nix";
ls="exa -lag --header"; ls="exa -l --no-time --no-permissions --no-user";
dev="nix develop --command fish"; dev="nix develop --command fish";
spot="steam-run ~/program/spotify_player"; spot="steam-run ~/program/spotify_player";
sc="sc-im"; sc="sc-im";
@ -48,6 +48,8 @@
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";
vpnup="sudo VPN_PROTOCOL=wireguard DISABLE_IPV6=yes DIP_TOKEN=no AUTOCONNECT=true PIA_PF=false PIA_DNS=true PIA_USER=p4558499 PIA_PASS=vUZA6Nfzci ~/program/manual-connections/run_setup.sh";
vpndown="wg-quick down pia";
}; };
interactiveShellInit = '' interactiveShellInit = ''
set fish_greeting # Disable greeting set fish_greeting # Disable greeting

24
shared/mpv.nix Normal file
View file

@ -0,0 +1,24 @@
{ pkgs, lib, myhostname, ... }:
{
programs.mpv = {
enable = true;
package = (
pkgs.mpv-unwrapped.wrapper {
scripts = with pkgs.mpvScripts; [
uosc
sponsorblock
];
mpv = pkgs.mpv-unwrapped.override {
};
}
);
config = {
profile = "high-quality";
ytdl-format = "bestvideo+bestaudio";
cache-default = 4000000;
};
};
}

11
shared/ssh.nix
View file

@ -79,6 +79,17 @@
port = 22; port = 22;
user = "ifacts"; user = "ifacts";
identityFile = "/home/fw/.ssh/ifacts-ssh-key"; identityFile = "/home/fw/.ssh/ifacts-ssh-key";
};
"kobo" = {
hostname = "192.168.1.192";
port = 22;
user = "root";
};
"disa" = {
hostname = "192.168.1.242";
port = 22;
user = "disah";
identityFile = "/home/fw/.ssh/id_rsa";
}; };
}; };
}; };

4
shared/zathura.nix
View file

@ -4,6 +4,10 @@
enable = true; enable = true;
options = { options = {
selection-clipboard = "clipboard"; selection-clipboard = "clipboard";
font = "FiraCodeNerdFont Normal 12";
}; };
extraConfig = ''
include catppuccin-latte
'';
}; };
} }