felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: felschr:23ffe0763763d806a50040b43e8078ecba591d49
Branches Tags
felschr:main
..
compare: felschr:b6c49b82b3ea2d23627a9936b12b05bfbc31db2d
Branches Tags
felschr:main

No commits in common. "23ffe0763763d806a50040b43e8078ecba591d49" and "b6c49b82b3ea2d23627a9936b12b05bfbc31db2d" have entirely different histories.
23ffe07637 ... b6c49b82b3

21 changed files with 80 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop/cosmic.nix
View file

@ -5,8 +5,8 @@
specialisation = {
cosmic.configuration = {
services.displayManager.gdm.enable = lib.mkForce false;
services.desktopManager.gnome.enable = lib.mkForce false;
services.xserver.displayManager.gdm.enable = lib.mkForce false;
services.xserver.desktopManager.gnome.enable = lib.mkForce false;
services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true;

9
desktop/gnome.nix
View file

@ -16,10 +16,10 @@
tailscale-qs
];
services.displayManager.gdm.enable = true;
services.displayManager.gdm.wayland = true;
services.desktopManager.gnome.enable = true;
services.desktopManager.gnome.extraGSettingsOverrides = ''
services.xserver.displayManager.gdm.enable = true;
services.xserver.displayManager.gdm.wayland = true;
services.xserver.desktopManager.gnome.enable = true;
services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
[org.gnome.desktop.input-sources]
sources=[('xkb', 'gb'), ('xkb', 'mozc-jp')]
@ -40,6 +40,7 @@
gnome-software
totem
epiphany
evince
];
programs.gnome-terminal.enable = false;
programs.geary.enable = false;

76
flake.lock generated
View file

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1762618334,
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
"lastModified": 1754433428,
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
"owner": "ryantm",
"repo": "agenix",
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
"type": "github"
},
"original": {
@ -26,11 +26,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1762131136,
"narHash": "sha256-LPDiiEPOZu5Ah5vCLyCMT3w1uoBhUjyqoPWCOiLVLnw=",
"lastModified": 1755109759,
"narHash": "sha256-+DN5bKev9IyefMikOqEWZf/u0flJbLAxwEotGhKSSS4=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "0f14e030b3a9391e761c03ce3c260730a78a4db6",
"rev": "9103afafff2b5287b495c1a1268968fdb447d66f",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
]
},
"locked": {
"lastModified": 1762286984,
"narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
"lastModified": 1756719547,
"narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
"rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2",
"type": "github"
},
"original": {
@ -129,11 +129,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1765253041,
"narHash": "sha256-D4/vwhvX26KW3gux9CCiJ87zc5UOiLTFlfG3+5h0VRI=",
"lastModified": 1757822625,
"narHash": "sha256-w+V97GrUZK5Lt50DOzhmFGPf3coxfj4TTNHa0rHswuE=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "687d6eb2a8503afdeaaf9e230fb72f880daa7252",
"rev": "5a1d5f5453eef0ea2510d9860d2f803911df6776",
"type": "gitlab"
},
"original": {
@ -178,11 +178,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
@ -198,11 +198,11 @@
]
},
"locked": {
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"lastModified": 1756770412,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github"
},
"original": {
@ -299,16 +299,16 @@
]
},
"locked": {
"lastModified": 1765170903,
"narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
"lastModified": 1757808926,
"narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "20561be440a11ec57a89715480717baf19fe6343",
"rev": "f21d9167782c086a33ad53e2311854a8f13c281e",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.11",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@ -353,11 +353,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1764440730,
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
"lastModified": 1757943327,
"narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
"rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
"type": "github"
},
"original": {
@ -368,27 +368,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1764983851,
"narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
"lastModified": 1757810152,
"narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
"rev": "9a094440e02a699be5c57453a092a8baf569bdad",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1765186076,
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
"lastModified": 1757745802,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
"type": "github"
},
"original": {
@ -423,11 +423,11 @@
"systems": "systems_3"
},
"locked": {
"lastModified": 1765269853,
"narHash": "sha256-F/54YLlz7FEmE45lWXyhVXPaBRHy31ttuPhGCbXH+Os=",
"lastModified": 1757924682,
"narHash": "sha256-YNnHjDE2uc8Z9+H97NoAhvm8cP8/8vctae0HVgTCEPE=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
"rev": "885f9ccc245b8a1d9a537bb28b3fbbd12a038165",
"rev": "16c20f7b8cde74a9751ace674db42608c86d129b",
"type": "github"
},
"original": {
@ -445,11 +445,11 @@
]
},
"locked": {
"lastModified": 1765016596,
"narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
"lastModified": 1757953049,
"narHash": "sha256-PwWGLIn8XNXSP4iRno2vK6b/Hy/mo6qZuRDzSB1VA4Y=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
"rev": "d1d8fe5cece10276fb7108e17c9a5efc07926ce5",
"type": "github"
},
"original": {

4
flake.nix
View file

@ -13,7 +13,7 @@ rec {
};
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -32,7 +32,7 @@ rec {
flake-utils.url = "github:numtide/flake-utils";
home-manager = {
url = "github:nix-community/home-manager/release-25.11";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};

5
hardware/xbox.nix
View file

@ -1,7 +1,6 @@
{ pkgs, ... }:
{
# TODO currently broken
# hardware.xone.enable = true;
# hardware.xpadneo.enable = true;
hardware.xone.enable = true;
hardware.xpadneo.enable = true;
}

2
home/ausweisapp.nix
View file

@ -2,5 +2,5 @@
with pkgs;
{
home.packages = [ ausweisapp ];
home.packages = [ AusweisApp2 ];
}

2
home/browsers/firefox.nix
View file

@ -8,7 +8,7 @@
with lib;
let
firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system};
firefox-addons = inputs.firefox-addons.packages.${pkgs.system};
inherit (import ../modules/firefox/common.nix { inherit config lib pkgs; }) mkConfig;

2
home/browsers/mullvad-browser.nix
View file

@ -6,7 +6,7 @@
}:
let
firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system};
firefox-addons = inputs.firefox-addons.packages.${pkgs.system};
commonSettings = {
# Disable DNS over HTTPS (use system DNS, i.e. VPN's DNS)

4
home/editors/lsp.nix
View file

@ -17,10 +17,10 @@
nodePackages.typescript-language-server
# not working like variant from node_modules
# nodePackages.graphql-language-service-cli
dockerfile-language-server
nodePackages.dockerfile-language-server-nodejs
haskellPackages.haskell-language-server
rust-analyzer
lua-language-server
sumneko-lua-language-server
marksman
# linters & formatters

2
home/felschr-work.nix
View file

@ -42,7 +42,7 @@ with pkgs;
home.packages = with pkgs; [
# system
gparted
gnome-firmware
gnome-firmware-updater
mission-center
# productivity

2
home/felschr.nix
View file

@ -43,7 +43,7 @@
home.packages = with pkgs; [
# system
gparted
gnome-firmware
gnome-firmware-updater
resources
# productivity

2
home/gaming/lutris.nix
View file

@ -10,6 +10,6 @@
home.packages = with pkgs; [
unstable.wineWowPackages.stable
lutris
unstable.heroic
heroic
];
}

6
home/git.nix
View file

@ -28,7 +28,7 @@
signing = {
signByDefault = true;
};
settings = {
extraConfig = {
init = {
defaultBranch = "main";
};
@ -41,7 +41,8 @@
abbreviateCommands = true;
missingCommitsCheck = "warn";
};
alias = {
};
aliases = {
# usage: git mr <source> <MR number> (git mr origin 1010)
mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -";
# usage: git pr <source> <PR number> (git pr origin 1010)
@ -51,5 +52,4 @@
clean-branches = ''!sh -c 'git branch --merged "''${1:-main}" | egrep -v "(^\*|master|main|staging|production)" | xargs git branch -d' -'';
};
};
};
}

1
home/modules/firefox/mullvad-browser.nix
View file

@ -22,7 +22,6 @@ in
vendorPath = ".mullvad";
configPath = "${vendorPath}/mullvadbrowser";
};
platforms.darwin = null;
})
(mkFirefoxProfileBinModule {
inherit modulePath name packageName;

1
home/modules/firefox/tor-browser.nix
View file

@ -22,7 +22,6 @@ in
vendorPath = ".tor project";
configPath = "${vendorPath}/firefox";
};
platforms.darwin = null;
})
(mkFirefoxProfileBinModule {
inherit modulePath name packageName;

10
home/modules/git.nix
View file

@ -36,12 +36,10 @@ in
{
programs.git = {
# fix/workaround for https://github.com/NixOS/nixpkgs/issues/169193
settings = {
safe.directory = "/etc/nixos";
user = {
inherit (profiles."${cfg.defaultProfile}") name email;
};
};
extraConfig.safe.directory = "/etc/nixos";
userName = profiles."${cfg.defaultProfile}".name;
userEmail = profiles."${cfg.defaultProfile}".email;
signing = {
key = profiles."${cfg.defaultProfile}".signingKey;
};

9
hosts/cmdframe/default.nix
View file

@ -1,9 +1,4 @@
{
inputs,
config,
pkgs,
...
}:
{ inputs, config, ... }:
{
imports = [
@ -46,7 +41,7 @@
];
services.ollama = {
package = pkgs.unstable.ollama-rocm;
acceleration = "rocm";
rocmOverrideGfx = "11.5.0";
};

14
hosts/home-pc/default.nix
View file

@ -1,9 +1,4 @@
{
inputs,
config,
pkgs,
...
}:
{ inputs, config, ... }:
{
imports = [
@ -59,7 +54,7 @@
];
networking.firewall.allowedUDPPorts = [
24727 # ausweisapp
24727 # AusweisApp2
];
networking.hosts = {
# force IPv4, see: https://github.com/transmission/transmission/issues/407
@ -67,9 +62,8 @@
};
services.ollama = {
package = pkgs.unstable.ollama-rocm;
# gfx1031 not officially supported, gfx1030 is closest
rocmOverrideGfx = "10.3.0";
acceleration = "rocm";
rocmOverrideGfx = "10.3.1";
};
seven = {

4
services/llm.nix
View file

@ -2,7 +2,6 @@
config,
inputs,
pkgs,
lib,
...
}:
@ -19,8 +18,7 @@
services.ollama = {
enable = true;
package = lib.mkDefault pkgs.unstable.ollama-vulkan;
host = "0.0.0.0";
package = pkgs.unstable.ollama;
};
services.open-webui = {

2
services/pcscd.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }:
{
# for reader used with ausweisapp
# for reader used with AusweisApp2
services.pcscd.enable = true;
services.pcscd.plugins = with pkgs; [
ccid

1
virtualisation/libvirt.nix
View file

@ -11,6 +11,7 @@
# Users need to be in groups: libvirtd, qemu-libvirtd
virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemu.runAsRoot = false;
virtualisation.libvirtd.qemu.ovmf.enable = true;
virtualisation.libvirtd.qemu.swtpm.enable = true;
virtualisation.libvirtd.onBoot = "ignore";
virtualisation.libvirtd.onShutdown = "shutdown";