added mroe packages

This commit is contained in:
fwastring 2025-11-23 12:31:01 +01:00
parent 517bba2149
commit 48bb58e1bc
10 changed files with 122 additions and 215 deletions

148
flake.lock generated
View file

@ -126,11 +126,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1762510976,
"narHash": "sha256-KGoSj8qMOOPaNE48RTtuNBbqOvKLTeklnRHWWvE/TXo=",
"lastModified": 1763724081,
"narHash": "sha256-hCgZsbaw21R9uL3iJwG8WT3VCMXVa7xjmxGRf0nwvL4=",
"owner": "catppuccin",
"repo": "nix",
"rev": "728cb0a667ce37bb0c68557dba819c7fb54ff1c8",
"rev": "e4676e1fd9b09131feadd3df556fd1d3f31fdd2d",
"type": "github"
},
"original": {
@ -198,11 +198,11 @@
]
},
"locked": {
"lastModified": 1762810396,
"narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=",
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github"
},
"original": {
@ -309,18 +309,20 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1748186689,
"narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
"host": "gitlab.gnome.org",
"lastModified": 1762869044,
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
"type": "github"
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
"type": "gitlab"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "48.2",
"ref": "gnome-49",
"repo": "gnome-shell",
"type": "github"
"type": "gitlab"
}
},
"home-manager": {
@ -330,11 +332,11 @@
]
},
"locked": {
"lastModified": 1762787259,
"narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
"lastModified": 1763869804,
"narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
"rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd",
"type": "github"
},
"original": {
@ -417,11 +419,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1762901961,
"narHash": "sha256-Oh7zDVRVW12nTiJD43UeuhqTox4c9vJCKnGIHHDbdic=",
"lastModified": 1763819976,
"narHash": "sha256-W/893N/ifviI1PP1BVIwhYhstN8s5UOsi5lvaYupXhA=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "308226a4fc2c9b63fa19894d5f85e79e05d75e03",
"rev": "e584a8bade2617899d69ae6f83011d0c1d2a9df7",
"type": "github"
},
"original": {
@ -517,11 +519,11 @@
]
},
"locked": {
"lastModified": 1758927902,
"narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
"lastModified": 1763254292,
"narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
"rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b",
"type": "github"
},
"original": {
@ -594,11 +596,11 @@
]
},
"locked": {
"lastModified": 1762387740,
"narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
"lastModified": 1763323331,
"narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
"rev": "0c6411851cc779d551edc89b83966696201611aa",
"type": "github"
},
"original": {
@ -659,11 +661,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1762905877,
"narHash": "sha256-Leao4Ts2loeMfslCEC2xjy6UH7H7C7g2u6yX/HqWYbM=",
"lastModified": 1763856300,
"narHash": "sha256-OXe/ZZqYoDmjqy19fuJzE9oR6XQH8IEGYjkDGGdQB5M=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "a8d1fa088164a7f4df2161a86d18d91b7100064c",
"rev": "3e067256eaa258df675cafaed2bcef55b41ecb60",
"type": "github"
},
"original": {
@ -675,11 +677,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1762904335,
"narHash": "sha256-52qh41MWguVgvnmvFvBAoU76x1zDO88LYc0l86aMaGo=",
"lastModified": 1763846764,
"narHash": "sha256-MTdbS6zBlxLJCMtPU394xUHk+wnK8aqVj4egblAiGGo=",
"owner": "neovim",
"repo": "neovim",
"rev": "97cb0d55717f0b9ffe0748d4cd220217abc51a63",
"rev": "4bbdffe8298e8bf6e0590684092a25f5effc0f14",
"type": "github"
},
"original": {
@ -690,11 +692,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1762844143,
"narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
"lastModified": 1763678758,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
"type": "github"
},
"original": {
@ -706,11 +708,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1762111121,
"narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"lastModified": 1763421233,
"narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
"type": "github"
},
"original": {
@ -738,11 +740,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1762363567,
"narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
"lastModified": 1763283776,
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
"type": "github"
},
"original": {
@ -754,11 +756,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1762604901,
"narHash": "sha256-Pr2jpryIaQr9Yx8p6QssS03wqB6UifnnLr3HJw9veDw=",
"lastModified": 1763618868,
"narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f6b44b2401525650256b977063dbcf830f762369",
"rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942",
"type": "github"
},
"original": {
@ -770,11 +772,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1762844143,
"narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
"lastModified": 1763678758,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
"type": "github"
},
"original": {
@ -785,22 +787,6 @@
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1760038930,
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1744536153,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@ -841,25 +827,6 @@
"type": "github"
}
},
"playerctl-gtk": {
"inputs": {
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1760272643,
"narHash": "sha256-F6Zh5eCm31QdAnV6JQS/4EhBj8TkqlHkiZpdZ6Ne1Pc=",
"ref": "main",
"rev": "3b2edf9af206704d6b79b3d6174752ce3e506726",
"revCount": 4,
"type": "git",
"url": "https://git.wastring.com/fw/playerctl-gtk"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.wastring.com/fw/playerctl-gtk"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
@ -870,11 +837,11 @@
]
},
"locked": {
"lastModified": 1762441963,
"narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
"lastModified": 1763319842,
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
"type": "github"
},
"original": {
@ -893,7 +860,6 @@
"minimal-tmux": "minimal-tmux",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nixpkgs": "nixpkgs_6",
"playerctl-gtk": "playerctl-gtk",
"sops-nix": "sops-nix",
"stylix": "stylix",
"typsite": "typsite"
@ -901,7 +867,7 @@
},
"rust-overlay": {
"inputs": {
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1749004659,
@ -924,11 +890,11 @@
]
},
"locked": {
"lastModified": 1762812535,
"narHash": "sha256-A91a+K0Q9wfdPLwL06e/kbHeAWSzPYy2EGdTDsyfb+s=",
"lastModified": 1763870012,
"narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "d75e4f89e58fdda39e4809f8c52013caa22483b7",
"rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
"type": "github"
},
"original": {
@ -958,11 +924,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1762264356,
"narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=",
"lastModified": 1763845141,
"narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=",
"owner": "nix-community",
"repo": "stylix",
"rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b",
"rev": "adc650610085adbe130b9860d5bdb869f96050af",
"type": "github"
},
"original": {

View file

@ -1,5 +1,5 @@
{
description = "fwastrings Nix-baserade konfigurationsfiler";
description = "Fredriks datorer";
inputs = {
# Nixpkgs
@ -16,21 +16,13 @@
url = "github:Glomzzz/typsite";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:catppuccin/nix";
confetti.url = "git+https://git.wastring.com/fw/confetti?ref=main";
playerctl-gtk.url = "git+https://git.wastring.com/fw/playerctl-gtk?ref=main";
bbk.url = "git+https://git.wastring.com/fw/bbk?ref=main";
# Neovim
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
# Home manager
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland";
minimal-tmux = {
url = "github:niksingh710/minimal-tmux-status";
inputs.nixpkgs.follows = "nixpkgs";
@ -46,17 +38,13 @@
sops-nix,
catppuccin,
confetti,
playerctl-gtk,
bbk,
...
}@inputs:
let
inherit (self) outputs;
system = "x86_64-linux";
in
{
# NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
legacy = nixpkgs.lib.nixosSystem {
specialArgs = {
@ -70,7 +58,6 @@
sops-nix.nixosModules.sops
catppuccin.nixosModules.catppuccin
confetti.nixosModules.default
playerctl-gtk.nixosModules.default
bbk.nixosModules.default
];
};
@ -97,7 +84,6 @@
sops-nix.nixosModules.sops
catppuccin.nixosModules.catppuccin
confetti.nixosModules.default
playerctl-gtk.nixosModules.default
bbk.nixosModules.default
];

View file

@ -23,7 +23,7 @@
};
nixpkgs.config.permittedInsecurePackages = [
"broadcom-sta-6.30.223.271-57-6.12.47"
"broadcom-sta-6.30.223.271-59-6.12.58"
];
nix.settings = {
@ -35,6 +35,8 @@
security.sudo.wheelNeedsPassword = false;
users.users.root.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDALsdpwvC0w/Aj+1fWtzJyyWoUrGkdh8o2thVHeQQBNo0D7cmVberYmi4Cv9gWGX6PaElrnOl0KRdGyro2wxOYokSxgk2VgWW67BFITAQAbKyG2NhXXPbhb4jccDo7WH7TtOG8IofuJTPRu1Duda6k4RN0I0CkyAN6LGX+zy49cq0qKf9ijXYhCDYNih3+Fu/ig0aW/SYmsVoUl2VFTWdI5x5/wLvIjTEZhmAtYIeYADaLnom356cFrUysZa++FUujQAz3Ow236BvP95XZdTsqvfWNZFNIpC9VYF72JeIDCs5wDIr0GFmanF2On1nar+jJpoOE8SdHt357p5g/PqXV5TisN2xQRkqVwO9tWtMl4sF84jA4ULnY2gQWv9jErMxymUQ1IwuPUzDDlbRHCtfexAtkBy7wv6xslKAzG1QahvF/btNs5Caj3LN31rgAuxyooCbKGKTeBP3kHPKcz1iupgidfbO/QqVXBRQJTEdGyAKa8hVmLQZZPC/XUhxESAk= fw@fw-nix"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8ku8iCb7tXd/tfxYDW+Tj8K9kpfrYZciYUZ6tBpO80inm4EImtfyEeJTuqDWMKov2BftUKs8brNeTBCXUEvU1P0+cpOP9RtYA5tfBXf3su+iVSswJJStIxNboXHrEGKdJJRNsTv/9agshDSUBy6G5TI1cXhv/updornfA4fwOMqOmtlYEn6XCRnsrO6NBLc/uLckdbF75HOsoLvezRvuqTLjpapjaUKGVPrgNXiclIKHmuOx71kgD4FX3rSz9FgKjnfu3a7DBbrHsf/g+N9PjNF1muN9UOV6nK3WwiO9BMWi7NpAWfzJOeZg9chqzI+U6CcsqYVeESgL41so+dnv3 fw@laptop"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP34dnsZSnWdDvd+3BXDwcw7wP0PjPEx2eCdBQJyGD6O fw@laptop"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII60tdNsG0z9q2jHmoTKvkeLQE6OF0bmTsDX1bpqpoG7 fw@jobb"
];

View file

@ -1,7 +1,3 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{
inputs,
config,
@ -10,7 +6,7 @@
...
}:
let
theme = "latte";
theme = "mocha";
in
{
imports = [
@ -32,12 +28,7 @@ in
];
kubernetes-tools.enable = true;
networking.networkmanager = {
enable = true;
plugins = with pkgs; [
networkmanager-openvpn
];
};
networking.hostName = myhostname;
stylix = {
enable = true;
@ -110,10 +101,7 @@ in
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = myhostname;
system.stateVersion = "25.05";
}

View file

@ -15,10 +15,16 @@
};
};
nix.registry = (lib.mapAttrs (_: flake: { inherit flake; })) (
nix = {
registry = (lib.mapAttrs (_: flake: { inherit flake; })) (
(lib.filterAttrs (_: lib.isType "flake")) inputs
);
nix.nixPath = [ "/etc/nix/path" ];
nixPath = [ "/etc/nix/path" ];
settings = {
experimental-features = "nix-command flakes";
auto-optimise-store = true;
};
};
users.defaultUserShell = pkgs.bash;
documentation.man.generateCaches = false;
programs.fish = {
@ -29,8 +35,6 @@
plymouth = {
enable = true;
};
# Enable "Silent boot"
consoleLogLevel = 3;
initrd.verbose = false;
kernelParams = [
@ -40,10 +44,18 @@
"udev.log_priority=3"
"rd.systemd.show_status=auto"
];
# Hide the OS choice for bootloaders.
# It's still possible to open the bootloader list by pressing any key
# It will just not appear on screen unless a key is pressed
loader.timeout = 0;
loader = {
timeout = 0;
efi = {
canTouchEfiVariables = true;
};
systemd-boot.enable = true;
grub = {
efiSupport = true;
efiInstallAsRemovable = true;
device = "nodev";
};
};
};
programs.bash = {
@ -60,11 +72,6 @@
value.source = value.flake;
}) config.nix.registry;
nix.settings = {
experimental-features = "nix-command flakes";
auto-optimise-store = true;
};
virtualisation = {
docker = {
enable = true;
@ -72,8 +79,6 @@
};
};
networking.networkmanager.enable = true;
environment.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
@ -101,19 +106,6 @@
LC_TIME = "sv_SE.UTF-8";
};
boot = {
loader = {
efi = {
canTouchEfiVariables = true;
};
systemd-boot.enable = true;
grub = {
efiSupport = true;
efiInstallAsRemovable = true;
device = "nodev";
};
};
};
console.keyMap = "sv-latin1";
programs.bat = {
@ -121,11 +113,14 @@
};
services.tailscale.enable = true;
networking.firewall = {
networking = {
networkmanager.enable = true;
firewall = {
checkReversePath = "loose";
trustedInterfaces = [ "tailscale0" ];
allowedUDPPorts = [ config.services.tailscale.port ];
};
};
services = {
printing.enable = true;

View file

@ -287,6 +287,7 @@ with lib;
# Screencapture
"$mod SHIFT, s, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t image/png"
"$mod SHIFT, c, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"$HOME/$(date +screenshot-%Y%m%d-%H%M%S.png)\""
# special
"SUPER+SHIFT, code:201, exec, confetti"

View file

@ -1,12 +1,15 @@
{
inputs,
lib,
config,
pkgs,
...
}:
{
options = {
typescript.enable = lib.mkEnableOption "enables kubernetes-tools";
};
config = lib.mkIf config.kubernetes-tools.enable {
environment.systemPackages = with pkgs; [
nixd
gopls
@ -27,4 +30,5 @@
# nodePackages.vscode-json-languageserver
# tailwindcss-language-server
];
};
}

View file

@ -5,7 +5,6 @@
lib,
config,
pkgs,
myhostname,
...
}:
{
@ -24,9 +23,6 @@
nmap
ipcalc
# openvpn
# openssh
# wireguard-tools
# (octodns.withProviders (ps: [
# octodns-providers.gandi
# ]))

View file

@ -30,7 +30,7 @@
drawio
evince
spotify
angryipscanner
firefox
# ansible
# freecad-wayland

View file

@ -1,5 +1,3 @@
# This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{
inputs,
lib,
@ -10,12 +8,6 @@
}:
{
# services.pcscd.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
programs.nh = {
enable = true;
clean.enable = true;
@ -24,24 +16,16 @@
};
environment.systemPackages = with pkgs; [
# Bluetooth
bluez
bluez-tools
# Zathura
poppler-utils
# Transform
imagemagick
pandoc
# Sound
alsa-utils
# Monitor
# brightnessctl
# System
sops
libnotify
unzip
@ -55,46 +39,31 @@
grc
vim
fastfetch
bc
# system call monitoring
strace # system call monitoring
lsof # list open files
# system tools
sysstat
lm_sensors # for `sensors` command
lm_sensors
ethtool
pciutils # lspci
usbutils # lsusb
pciutils
usbutils
# Files
fzf
eza
rsync
# dust
ripgrep
fd
# Misc
lolcat
fortune
cowsay
# Security
openssl
# Git
lazygit
hyprpicker
# Typesetting
typst
typstyle
tinymist
# websocat
# nix-search-cli
# libsixel
(
let