Compare commits

...

5 Commits

Author SHA1 Message Date
7109f83083 update to nixos 25.11 2025-12-14 18:12:48 +01:00
90bc596b0d use unstable stuff 2025-11-29 21:44:47 +01:00
17b0ee58a8 update unstable, add Cosmic desktop 2025-11-04 11:01:19 +01:00
46c61bd1e1 add cursor-cli 2025-09-12 15:58:17 +02:00
30888639c2 add SPORE firewall config and some tools 2025-09-04 12:27:00 +02:00
7 changed files with 65 additions and 31 deletions

35
os/flake.lock generated
View File

@@ -7,32 +7,48 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750792728, "lastModified": 1765605144,
"narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "rev": "90b62096f099b73043a747348c11dbfcfbdea949",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1751211869, "lastModified": 1765608474,
"narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "narHash": "sha256-9Wx53UK0z8Di5iesJID0tS1dRKwGxI4i7tsSanOHhF0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "rev": "28bb483c11a1214a73f9fd2d9928a6e2ea86ec71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1761656231,
"narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -40,7 +56,8 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
} }
} }
}, },

View File

@@ -2,12 +2,13 @@
description = "flake for nixos"; description = "flake for nixos";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.url = "github:nix-community/home-manager/release-25.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
}; };
outputs = { self, nixpkgs, home-manager }: { outputs = { self, nixpkgs, nixpkgs-unstable, home-manager }: {
nixosConfigurations = { nixosConfigurations = {
gnome = nixpkgs.lib.nixosSystem { gnome = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@@ -21,6 +22,7 @@
./users/demo.nix ./users/demo.nix
./users/master.nix ./users/master.nix
]; ];
specialArgs = { inherit nixpkgs-unstable; };
}; };
kde = nixpkgs.lib.nixosSystem { kde = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@@ -34,6 +36,7 @@
./users/demo.nix ./users/demo.nix
./users/master.nix ./users/master.nix
]; ];
specialArgs = { inherit nixpkgs-unstable; };
}; };
hyprland = nixpkgs.lib.nixosSystem { hyprland = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
@@ -47,6 +50,7 @@
./users/demo.nix ./users/demo.nix
./users/master.nix ./users/master.nix
]; ];
specialArgs = { inherit nixpkgs-unstable; };
}; };
}; };
}; };

View File

@@ -0,0 +1,3 @@
{ pkgs, ... }: {
services.desktopManager.cosmic.enable = true;
}

View File

@@ -3,7 +3,8 @@
enable = true; enable = true;
xkb.layout = "ch"; xkb.layout = "ch";
xkb.variant = ""; xkb.variant = "";
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
}; };
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;
services.desktopManager.cosmic.enable = true;
} }

View File

@@ -11,9 +11,11 @@
enable = true; enable = true;
allowedTCPPortRanges = [ allowedTCPPortRanges = [
{ from = 1714; to = 1764; } # KDE Connect { from = 1714; to = 1764; } # KDE Connect
{ from = 3000; to = 3001; } # SPORE
]; ];
allowedUDPPortRanges = [ allowedUDPPortRanges = [
{ from = 1714; to = 1764; } # KDE Connect { from = 1714; to = 1764; } # KDE Connect
{ from = 4210; to = 4210; } # SPORE
]; ];
}; };
}; };

View File

@@ -1,14 +1,10 @@
{ config, pkgs, ... }: { config, pkgs, nixpkgs-unstable, ... }:
let let
unstable = import unstable = import nixpkgs-unstable {
(builtins.fetchTarball { system = pkgs.stdenv.hostPlatform.system;
url = "https://github.com/nixos/nixpkgs/tarball/nixpkgs-unstable"; config = config.nixpkgs.config;
sha256 = "sha256:19wkjfhyidvkp4wjrr7idx83iiql6bskp1x1wrp52y0lc3xx847y"; };
}) in {
# reuse the current configuration
{ config = config.nixpkgs.config; };
in
{
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;
@@ -37,8 +33,10 @@ in
ripgrep ripgrep
jq jq
git git
ranger
highlight
gnumake gnumake
pinentry pinentry-gnome3
direnv direnv
dnsutils dnsutils
netcat netcat
@@ -56,12 +54,11 @@ in
ledger-live-desktop ledger-live-desktop
ledger-udev-rules ledger-udev-rules
android-tools android-tools
android-udev-rules
ghostty ghostty
alacritty alacritty
brave brave
#unstable.gsconnect #unstable.gsconnect
code-cursor unstable.code-cursor
go go
gnomeExtensions.forge gnomeExtensions.forge
platformio platformio
@@ -74,6 +71,12 @@ in
uv uv
portaudio portaudio
python312Packages.pyaudio python312Packages.pyaudio
hwinfo
usbutils
unstable.cursor-cli
ffmpeg
unstable.golangci-lint
unstable.terraform
]; ];
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
@@ -95,9 +98,11 @@ in
pkgs.platformio-core.udev pkgs.platformio-core.udev
pkgs.openocd pkgs.openocd
]; ];
services.logind.extraConfig = '' services.logind.settings = {
RuntimeDirectorySize=20G Login = {
''; RuntimeDirectorySize = "20G";
};
};
systemd.sleep.extraConfig = '' systemd.sleep.extraConfig = ''
AllowSuspend=yes AllowSuspend=yes
AllowHibernation=yes AllowHibernation=yes

View File

@@ -12,6 +12,9 @@
home.stateVersion = "23.05"; home.stateVersion = "23.05";
home.username = "master"; home.username = "master";
home.homeDirectory = "/home/master"; home.homeDirectory = "/home/master";
home.sessionVariables = {
EDITOR = "vim";
};
home.packages = with pkgs; [ home.packages = with pkgs; [
#plasma5Packages.bismuth #plasma5Packages.bismuth
#kdeconnect #kdeconnect
@@ -26,7 +29,6 @@
ranger ranger
vscode vscode
nodejs nodejs
terraform
consul consul
nomad nomad
packer packer