Compare commits

..

No commits in common. "a1ca221025182c6e9f295e830314cf6043fa889a" and "2025985703bad7323016e8bf001f084d6538bc36" have entirely different histories.

39 changed files with 160 additions and 261 deletions

66
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1744117652,
"narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
"lastModified": 1739757849,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
},
"nix-flatpak": {
"locked": {
"lastModified": 1741903049,
"narHash": "sha256-8Y8brH04JjSLrCLvBEbhK9vOu7lhQhqUBW4kI3tifdI=",
"lastModified": 1739444422,
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "42c7fb2702219b86a8f5969c3475ce594c28f5d0",
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
]
},
"locked": {
"lastModified": 1742568034,
"narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
"lastModified": 1737057290,
"narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
"rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1743420942,
"narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=",
"lastModified": 1740089251,
"narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4",
"rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
"type": "github"
},
"original": {
@ -88,29 +88,13 @@
"type": "github"
}
},
"nixos-unstable": {
"locked": {
"lastModified": 1743964447,
"narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1743975612,
"narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=",
"lastModified": 1739923778,
"narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a880f49904d68b5e53338d1e8c7bf80f59903928",
"rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
"type": "github"
},
"original": {
@ -120,14 +104,30 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1739866667,
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixos-generators": "nixos-generators",
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}
},

View file

@ -19,7 +19,7 @@
};
# NixOS unstable channel
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
# ready made hardware configurations. e.G.: Power saving
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
@ -35,7 +35,7 @@
self,
nixpkgs,
nixos-hardware,
nixos-unstable,
nixpkgs-unstable,
nix-flatpak,
home-manager,
nixos-generators,
@ -53,7 +53,7 @@
host_helper = hostname: {
${hostname} = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;} // {inherit nixos-unstable;};
specialArgs = {inherit inputs;};
modules = [
./hosts/${hostname}/${hostname}.nix
];
@ -74,7 +74,7 @@
#nixosModules = import ./modules/nixos;
# Reusable home-manager modules you might want to export
# These are usually stuff you would upstream into home-manager
#homeManagerModules = import ./modules/home-manager;
homeManagerModules = import ./modules/home-manager;
# NixOS configuration entrypoint
# Available through 'nixos-rebuild --flake .#your-hostname'

View file

@ -1,4 +1,4 @@
{
{...}: {
boot.loader = {
systemd-boot.enable = true;
systemd-boot.configurationLimit = 20;

View file

@ -2,7 +2,6 @@
pkgs,
inputs,
modulesPath,
nixos-unstable,
...
}: {
networking.hostName = "crocoite"; # Define your hostname.
@ -79,7 +78,5 @@
../../modules/wm_and_de
../../modules/pkg_mgrmnt
# ../../tests
];
}

View file

@ -1,4 +1,4 @@
{
{...}: {
# Use the GRUB 2 boot loader.
#boot.loader.grub.enable = true;
# Define on which hard drive you want to install Grub.

View file

@ -1,4 +1,4 @@
{
{...}: {
services = {
speechd.enable = true;
orca.enable = true;

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
#./plymouth.nix
./accessibility.nix

View file

@ -1,9 +1,7 @@
{
networking.firewall = {
enable = false;
{...}: {
# Open ports in the firewall.
allowedTCPPorts = [8080 10001 10002];
allowedUDPPorts = [8080 10001 10002];
};
networking.firewall.allowedTCPPorts = [8080 10001 10002];
networking.firewall.allowedUDPPorts = [8080 10001 10002];
# Or disable the firewall altogether.
networking.firewall.enable = false;
}

View file

@ -1,4 +1,4 @@
{
{...}: {
hardware.bluetooth.enable = true; # enables support for Bluetooth
hardware.bluetooth.powerOnBoot = false; # powers up the default Bluetooth controller on boot

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./bluetooth.nix
./fwupd.nix

View file

@ -1,4 +1,4 @@
{
{...}: {
# A system daemon to allow session software to update firmware
services.fwupd.enable = true;
}

View file

@ -1,4 +1,4 @@
{
{...}: {
# probably does nothing on my amd laptop. need to check
hardware.trackpoint.speed = 200;
}

View file

@ -1,4 +1,4 @@
{
{...}: {
# Set your time zone.
time.timeZone = "Europe/Berlin";

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./flatpak.nix
./podman.nix

View file

@ -1,4 +1,4 @@
{
{...}: {
services.flatpak = {
enable = true;
update.auto = {

View file

@ -1,4 +1,4 @@
{
{...}: {
nix = {
optimise = {
automatic = true;

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./apparmor.nix
./firejail.nix

View file

@ -1,4 +1,4 @@
{
{...}: {
# for running android apps
# also starts the systemd service waydroid-container
virtualisation.waydroid.enable = true;

View file

@ -0,0 +1,62 @@
{pkgs, ...}: {
# Enable sound with pipewire
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa = {
enable = true;
support32Bit = true;
};
pulse.enable = true;
# If you want to use JACK applications, uncomment this
jack.enable = true;
extraConfig.pipewire."99-input-denoise" = {
"context.modules" = [
{
"name" = "libpipewire-module-filter-chain";
"args" = {
"node.description" = "Noise Canceling source";
"media.name" = "Noise Canceling source";
"filter.graph" = {
"nodes" = [
{
"type" = "ladspa";
"name" = "rnnoise";
"plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
"label" = "noise_suppressor_stereo";
"control" = {
"VAD Threshold (%)" = 75.0;
};
}
];
};
"audio.position" = [
"FL"
"FR"
];
"capture.props" = {
"node.name" = "effect_input.rnnoise";
"node.passive" = true;
};
"playback.props" = {
"node.name" = "effect_output.rnnoise";
"media.class" = "Audio/Source";
};
};
}
];
};
};
environment.systemPackages = with pkgs; [
helvum
pwvucontrol
lxqt.pavucontrol-qt
qpwgraph
easyeffects
non
roc-toolkit
];
}

View file

@ -1,30 +0,0 @@
{pkgs, ...}: {
# Enable sound with pipewire
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
# If you want to use JACK applications, uncomment this
jack.enable = true;
pulse.enable = true;
alsa = {
enable = true;
support32Bit = true;
};
};
environment.systemPackages = with pkgs; [
helvum
pwvucontrol
lxqt.pavucontrol-qt
qpwgraph
easyeffects
non
roc-toolkit
];
}

View file

@ -1,6 +0,0 @@
{
imports = [
./audio_video.nix
./noise_cancel.nix
];
}

View file

@ -1,38 +0,0 @@
{pkgs, ...}: {
services.pipewire.extraConfig.pipewire."99-input-denoise" = {
"context.modules" = [
{
"name" = "libpipewire-module-filter-chain";
"args" = {
"node.description" = "Noise Canceling source";
"media.name" = "Noise Canceling source";
"filter.graph" = {
"nodes" = [
{
"type" = "ladspa";
"name" = "rnnoise";
"plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so";
"label" = "noise_suppressor_stereo";
"control" = {
"VAD Threshold (%)" = 75.0;
};
}
];
};
"audio.position" = [
"FL"
"FR"
];
"capture.props" = {
"node.name" = "effect_input.rnnoise";
"node.passive" = true;
};
"playback.props" = {
"node.name" = "effect_output.rnnoise";
"media.class" = "Audio/Source";
};
};
}
];
};
}

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./brave.nix
./firefox.nix

View file

@ -1,16 +1,14 @@
{
{...}: {
imports = [
./android.nix
./audio_video
./audio_video.nix
./flatpak.nix
./fonts.nix
./game.nix
./obs-studio.nix
./shell.nix
./software.nix
./virt.nix
./android.nix
#./mpv.nix
./neovim.nix
./obs-studio.nix
./packages.nix
./programs.nix
./shell.nix
./virt.nix
];
}

View file

@ -1,4 +1,4 @@
{
{...}: {
services.flatpak = {
packages = [
{
@ -17,6 +17,7 @@
origin = "flathub";
appId = "com.github.hugolabe.Wike";
} # Wikpedia, but in nice
#{ origin = "flathub"; appId = "com.jeffser.Alpaca"; } # Local chat AI
{
origin = "flathub";
appId = "io.gpt4all.gpt4all";
@ -49,10 +50,6 @@
origin = "flathub";
appId = "com.etlegacy.ETLegacy";
} # shooter
{
origin = "flathub";
appId = "org.js.nuclear.Nuclear";
}
#"com.obsproject.Studio" #this is another way to write it
];

View file

@ -1,19 +0,0 @@
{pkgs, ...}: {
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
liberation_ttf
dina-font
proggyfonts
font-awesome
jetbrains-mono
fira-code
fira-code-symbols
#droid-sans-mono
(nerdfonts.override {
fonts = ["FiraCode" "DroidSansMono" "JetBrainsMono"];
})
];
}

View file

@ -1,4 +1,4 @@
{
{...}: {
programs.neovim = {
enable = true;
viAlias = true;

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
#./doc.nix
./index.nix

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./libreoffice.nix
];

View file

@ -1,4 +0,0 @@
{
# also opens the TCP and UDP port from 1714 to 1764
programs.kdeconnect.enable = true;
}

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./zsh.nix
./fish.nix

View file

@ -1,4 +1,4 @@
{
{...}: {
system.userActivationScripts.zshrc = "touch .zshrc";
programs.zsh = {

View file

@ -1,4 +1,9 @@
{pkgs, ...}: {
# also opens the TCP and UDP port from 1714 to 1764
programs.kdeconnect.enable = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
# low level stuff
efibootmgr
@ -46,7 +51,6 @@
# move to homemanager?
unstable.mumble
amberol
mpv
nuclear
#zathura
sioyek
@ -60,4 +64,22 @@
timer
prusa-slicer
];
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
liberation_ttf
dina-font
proggyfonts
font-awesome
jetbrains-mono
fira-code
fira-code-symbols
#droid-sans-mono
(nerdfonts.override {
fonts = ["FiraCode" "DroidSansMono" "JetBrainsMono"];
})
];
}

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./ranomier.nix
];

View file

@ -1,4 +1,4 @@
{
{...}: {
services.dbus = {
implementation = "broker";
apparmor = "enabled";

View file

@ -1,4 +1,4 @@
{
{...}: {
imports = [
./hyprland.nix
#./qtile.nix

View file

@ -15,7 +15,7 @@
# When applied, the unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable'
unstable-packages = final: _prev: {
unstable = import inputs.nixos-unstable {
unstable = import inputs.nixpkgs-unstable {
system = final.system;
config.allowUnfree = true;
};

View file

@ -1,5 +0,0 @@
{
imports = [
./glitchtip-container.nix
];
}

View file

@ -1,73 +0,0 @@
{
nixos-unstable,
inputs,
...
}: {
networking.nat = {
enable = true;
internalInterfaces = ["ve-+"];
externalInterface = "ens3";
# Lazy IPv6 connectivity for the container
enableIPv6 = true;
};
containers.glitchtip = {
autoStart = true;
privateNetwork = true;
hostAddress = "192.168.100.10";
localAddress = "192.168.100.11";
hostAddress6 = "fc00::1";
localAddress6 = "fc00::2";
path =
(nixos-unstable.lib.nixosSystem {
system = "x86_64-linux";
modules = [
{
boot.isContainer = true;
#services.glitchtip = {
# enable = true;
# listenAddress = "0.0.0.0";
# settings = {
# GLITCHTIP_DOMAIN = "http://localhost";
# };
#};
#services = {
# logrotate.enable = lib.mkForce false;
# httpd = {
# enable = true;
# adminAddr = "admin@example.org";
# };
#};
# imports = [
# #(modulesPath + "/profiles/perlless.nix")
# (modulesPath + "/profiles/minimal.nix")
# {
# environment.defaultPackages = [ ];
# boot.kernel.enable = false;
# boot.isContainer = true;
# nixpkgs.overlays = [ (self: super: { }) ];
# }
# ];
# disabledModules = [
# (modulesPath + "/profiles/all-hardware.nix")
# (modulesPath + "/profiles/base.nix")
# ];
networking = {
firewall.allowedTCPPorts = [80];
# Use systemd-resolved inside the container
# Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686
useHostResolvConf = false;
};
services.resolved.enable = true;
system.stateVersion = "25.05";
}
];
})
.outPath;
};
}