From f59b9c3acb98ac66a916231c95b9712ace750566 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 1 Jan 2025 21:11:55 +0100 Subject: [PATCH 01/31] 306 current 2024-12-28 00:21:47 24.11.20241222.1807c2b 6.12.2-zen1 * --- hosts/crocoite/crocoite.nix | 2 -- modules/customisation.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index 4a75200..b206c7e 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -6,8 +6,6 @@ }: { networking.hostName = "crocoite"; # Define your hostname. - #MANPAGER='nvim +Man!' - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/modules/customisation.nix b/modules/customisation.nix index 1179963..824f102 100644 --- a/modules/customisation.nix +++ b/modules/customisation.nix @@ -1,5 +1,4 @@ {pkgs, ...}: { - #MANPAGER='nvim +Man!' environment.systemPackages = [pkgs.neovim]; environment.variables = { "MANPAGER" = "nvim +Man!"; From 447fa2e8411958e3878b21d167ec64accbe22389 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 2 Jan 2025 00:16:48 +0100 Subject: [PATCH 02/31] 307 current 2025-01-01 23:06:37 24.11.20241231.edf04b7 6.12.2-zen1 * --- flake.lock | 30 ++++++++++++++--------------- modules/pkg_mgrmnt/auto_upgrade.nix | 0 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 modules/pkg_mgrmnt/auto_upgrade.nix diff --git a/flake.lock b/flake.lock index c3adb17..2e15c71 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1734864618, - "narHash": "sha256-8SCTJhDH1fdNGGFhuGStIqbO7vwUKQokgQu6nQlQagY=", + "lastModified": 1735500379, + "narHash": "sha256-5qmX6YYjYfVYBbsmd2XxbTi7A59YuuN9IwfXU7qFquQ=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "13be795cac27df7044a425c0b2de3a42b10ddb18", + "rev": "c31b6cbd11707fe2c74ad805ef085d59d75116ae", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { diff --git a/modules/pkg_mgrmnt/auto_upgrade.nix b/modules/pkg_mgrmnt/auto_upgrade.nix new file mode 100644 index 0000000..e69de29 From 5a84295dc7f71c3d1a50867231326c20154b30f8 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 2 Jan 2025 00:33:18 +0100 Subject: [PATCH 03/31] 308 current 2025-01-02 00:33:12 24.11.20241231.edf04b7 6.12.2-zen1 * --- modules/wm_and_de/default.nix | 1 + modules/wm_and_de/qtile.nix | 79 +++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 modules/wm_and_de/qtile.nix diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix index 226c715..1e95e7b 100644 --- a/modules/wm_and_de/default.nix +++ b/modules/wm_and_de/default.nix @@ -1,6 +1,7 @@ {...}: { imports = [ ./hyprland.nix + ./qtile.nix ./components/dbus.nix ]; } diff --git a/modules/wm_and_de/qtile.nix b/modules/wm_and_de/qtile.nix new file mode 100644 index 0000000..7f60860 --- /dev/null +++ b/modules/wm_and_de/qtile.nix @@ -0,0 +1,79 @@ +{ + config, + pkgs, + lib, + ... +}: { + nixpkgs.overlays = [ + (self: super: { + qtile-unwrapped = super.qtile-unwrapped.overrideAttrs (_: rec { + postInstall = let + qtileSession = '' + [Desktop Entry] + Name=Qtile Wayland + Comment=Qtile on Wayland + Exec=qtile start -b wayland + Type=Application + ''; + in '' + mkdir -p $out/share/wayland-sessions + echo "${qtileSession}" > $out/share/wayland-sessions/qtile.desktop + ''; + passthru.providedSessions = ["qtile"]; + }); + }) + ]; + + services.xserver.displayManager.sessionPackages = [pkgs.qtile-unwrapped]; + services.xserver.windowManager.qtile.enable = true; + + # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit + services.gvfs.enable = true; + + qt = { + enable = true; + platformTheme = "qt5ct"; + style = "kvantum"; + }; + + environment.pathsToLink = ["/share/foot"]; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # for tiling window manager + foot + foot.themes + wofi + wl-clipboard # for waydroid and maybe more + wlogout + pamixer + #unstable.kanshi + shikane + dunst + + # audio + mixxc + ncpamixer + + # for screenshot + annotation + grim + slurp + satty + flameshot + + # theming + gruvbox-plus-icons + gruvbox-gtk-theme + kde-gruvbox + capitaine-cursors-themed + libsForQt5.qtstyleplugin-kvantum + kdePackages.qtstyleplugin-kvantum + + # polkit auth agent + lxqt.lxqt-policykit + + # file manager + nautilus + ]; +} From eb515c0d95a298403876906890f05691779ee510 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 2 Jan 2025 00:34:56 +0100 Subject: [PATCH 04/31] 309 current 2025-01-02 00:34:51 24.11.20241231.edf04b7 6.12.2-zen1 * --- modules/wm_and_de/qtile.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/wm_and_de/qtile.nix b/modules/wm_and_de/qtile.nix index 7f60860..dab6d1c 100644 --- a/modules/wm_and_de/qtile.nix +++ b/modules/wm_and_de/qtile.nix @@ -23,8 +23,7 @@ }); }) ]; - - services.xserver.displayManager.sessionPackages = [pkgs.qtile-unwrapped]; + services.displayManager.sessionPackages = [pkgs.qtile-unwrapped]; services.xserver.windowManager.qtile.enable = true; # for mounting stuff, also needs a auth agent like lxqt.lxqt-policykit From a4beaf235889e5475bace2687e63b94cd80a51e8 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 4 Jan 2025 00:49:01 +0100 Subject: [PATCH 05/31] 310 current 2025-01-04 00:48:53 24.11.20241231.edf04b7 6.12.2-zen1 * --- flake.lock | 37 +++++++++++++++++++++++++++++++++++ flake.nix | 14 +++++++------ hosts/factorio/factorio.nix | 24 +++++++++++++++++++++-- modules/software/software.nix | 2 ++ 4 files changed, 69 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 2e15c71..16b04a9 100644 --- a/flake.lock +++ b/flake.lock @@ -36,6 +36,42 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1735388221, @@ -88,6 +124,7 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" diff --git a/flake.nix b/flake.nix index 287f0c1..028a561 100644 --- a/flake.nix +++ b/flake.nix @@ -12,18 +12,20 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # generating filesystems in different formats + nixos-generators = { + url = "github:nix-community/nixos-generators"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # NixOS unstable channel nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # ready made hardware configurations. e.G.: Power saving - nixos-hardware = { - url = "github:NixOS/nixos-hardware/master"; - }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # for managing flatpaks, like which ones are installed and which not - nix-flatpak = { - url = "github:gmodena/nix-flatpak"; - }; + nix-flatpak.url = "github:gmodena/nix-flatpak"; }; ####### diff --git a/hosts/factorio/factorio.nix b/hosts/factorio/factorio.nix index e504fae..057ad1f 100644 --- a/hosts/factorio/factorio.nix +++ b/hosts/factorio/factorio.nix @@ -37,7 +37,7 @@ # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, # focused on correctness, usability, and growth – # and committed to doing right by its community. - nix.package = pkgs.lix; + #nix.package = pkgs.lix; imports = [ #nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1 #./hardware-configuration.nix @@ -45,6 +45,26 @@ ./hardware-configuration.nix ../../modules/locale.nix - ../../modules/game/server/factorio/factorio.nix + #../../modules/game/server/factorio/factorio.nix + + + + + + { + programs.command-not-found.enable = false; + environment.defaultPackages = []; + xdg = { + icons.enable = false; + mime.enable = false; + sounds.enable = false; + }; + documentation.man.enable = false; + documentation.nixos.enable = false; + } + ]; + disabledModules = [ + + ]; } diff --git a/modules/software/software.nix b/modules/software/software.nix index a1c62bf..a705c78 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -69,6 +69,8 @@ element-desktop rustdesk-flutter timer + rtl-sdr + gqrx ]; fonts.packages = with pkgs; [ From a65a0b76d75d8869a3068b9c70f4f6228597caea Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 4 Jan 2025 00:54:04 +0100 Subject: [PATCH 06/31] 311 current 2025-01-04 00:53:58 24.11.20241231.edf04b7 6.12.2-zen1 * --- modules/software/software.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/software/software.nix b/modules/software/software.nix index a705c78..a676136 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -72,6 +72,8 @@ rtl-sdr gqrx ]; + hardware.rtl-sdr.enable = true; + users.users."ranomier".extraGroups = ["plugdev"]; fonts.packages = with pkgs; [ noto-fonts From 9dd80cd5abbf6c65d6b2acc825a2e7489fd8d448 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 4 Jan 2025 01:01:59 +0100 Subject: [PATCH 07/31] 312 current 2025-01-04 01:01:52 24.11.20241231.edf04b7 6.12.2-zen1 * --- modules/software/software.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/software/software.nix b/modules/software/software.nix index a676136..a1c62bf 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -69,11 +69,7 @@ element-desktop rustdesk-flutter timer - rtl-sdr - gqrx ]; - hardware.rtl-sdr.enable = true; - users.users."ranomier".extraGroups = ["plugdev"]; fonts.packages = with pkgs; [ noto-fonts From ec717bcaf83a869593745d6e55209d7bfc3ce2cf Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 4 Jan 2025 01:32:34 +0100 Subject: [PATCH 08/31] 313 current 2025-01-04 01:32:27 24.11.20241231.edf04b7 6.12.2-zen1 * --- modules/software/software.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/software/software.nix b/modules/software/software.nix index a1c62bf..4706228 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -59,7 +59,8 @@ amberol nuclear mpv - zathura + #zathura + sioyek libreoffice #feh nomacs From 7fa2c15c64484367cd825e3417fc54e8c3c59a60 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 13 Jan 2025 03:13:37 +0100 Subject: [PATCH 09/31] random stuff --- flake.lock | 30 ++++++++++---------- modules/software/shell.nix | 43 +--------------------------- modules/software/shells/default.nix | 6 ++++ modules/software/shells/fish.nix | 14 +++++++++ modules/software/shells/zsh.nix | 44 +++++++++++++++++++++++++++++ modules/wm_and_de/hyprland.nix | 3 ++ 6 files changed, 83 insertions(+), 57 deletions(-) create mode 100644 modules/software/shells/default.nix create mode 100644 modules/software/shells/fish.nix create mode 100644 modules/software/shells/zsh.nix diff --git a/flake.lock b/flake.lock index 16b04a9..d1a4ddc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1735344290, - "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "613691f285dad87694c2ba1c9e6298d04736292d", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1735500379, - "narHash": "sha256-5qmX6YYjYfVYBbsmd2XxbTi7A59YuuN9IwfXU7qFquQ=", + "lastModified": 1736334301, + "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "c31b6cbd11707fe2c74ad805ef085d59d75116ae", + "rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736441705, + "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735471104, - "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { diff --git a/modules/software/shell.nix b/modules/software/shell.nix index 835fbe0..d14ff01 100644 --- a/modules/software/shell.nix +++ b/modules/software/shell.nix @@ -2,49 +2,8 @@ # everyone should use zsh xD users.defaultUserShell = pkgs.zsh; # Prevent the new user dialog in zsh - system.userActivationScripts.zshrc = "touch .zshrc"; - - programs.zsh = { - enable = true; - shellInit = '' - compinit () { - builtin autoload -XUz /run/current-system/sw/share/zsh/$ZSH_VERSION/functions - } - # config options to make zsh obey XDG base directory standard - ZDOTDIR=$HOME/.config/zsh - [ -d "$HOME"/.config/zsh ] || mkdir -p "$HOME"/.config/zsh - HISTFILE="$XDG_STATE_HOME"/zsh/history - # Completion files: Use XDG dirs - [ -d "$XDG_CACHE_HOME"/zsh ] || mkdir -p "$XDG_CACHE_HOME"/zsh - zstyle ':completion:*' cache-path "$XDG_CACHE_HOME"/zsh/zcompcache - compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-$ZSH_VERSION - - # Note that to manually override this in ~/.zshrc you should run `prompt off` - # before setting your PS1 and etc. Otherwise this will likely to interact with - # your ~/.zshrc configuration in unexpected ways as the default prompt sets - # a lot of different prompt variables. - autoload -U promptinit && promptinit && prompt suse && setopt prompt_sp - - HISTFILE=~/.histfile - HISTSIZE=1000 - SAVEHIST=1000 - - # bindkey - bindkey -e - - bindkey "\e[3~" delete-char - # Home- und End-Keys. - bindkey '\e[1~' beginning-of-line - bindkey '\e[4~' end-of-line - - # to redo the initial zsh installation run these commands - #autoload -Uz zsh-newuser-install - #zsh-newuser-install -f - ''; - - ohMyZsh.enable = true; - }; + # supports many shell so it lives here programs.starship = { enable = true; settings = { diff --git a/modules/software/shells/default.nix b/modules/software/shells/default.nix new file mode 100644 index 0000000..9bc0c56 --- /dev/null +++ b/modules/software/shells/default.nix @@ -0,0 +1,6 @@ +{...}: { + imports = [ + ./zsh.nix + ./fish.nix + ]; +} diff --git a/modules/software/shells/fish.nix b/modules/software/shells/fish.nix new file mode 100644 index 0000000..317e540 --- /dev/null +++ b/modules/software/shells/fish.nix @@ -0,0 +1,14 @@ +{ ... }:{ + programs = { + fish = { + enable = true; + useBabelfish = true; + shellInit = '' + starship init fish | source + ''; + }; + nix-index.enableFishIntegration = true; + direnv.enableFishIntegration = true; + foot.enableFishIntegration = true; + }; +} diff --git a/modules/software/shells/zsh.nix b/modules/software/shells/zsh.nix new file mode 100644 index 0000000..eb0baa8 --- /dev/null +++ b/modules/software/shells/zsh.nix @@ -0,0 +1,44 @@ +{ ... }:{ + system.userActivationScripts.zshrc = "touch .zshrc"; + + programs.zsh = { + enable = true; + shellInit = '' + compinit () { + builtin autoload -XUz /run/current-system/sw/share/zsh/$ZSH_VERSION/functions + } + # config options to make zsh obey XDG base directory standard + ZDOTDIR=$HOME/.config/zsh + [ -d "$HOME"/.config/zsh ] || mkdir -p "$HOME"/.config/zsh + HISTFILE="$XDG_STATE_HOME"/zsh/history + # Completion files: Use XDG dirs + [ -d "$XDG_CACHE_HOME"/zsh ] || mkdir -p "$XDG_CACHE_HOME"/zsh + zstyle ':completion:*' cache-path "$XDG_CACHE_HOME"/zsh/zcompcache + compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-$ZSH_VERSION + + # Note that to manually override this in ~/.zshrc you should run `prompt off` + # before setting your PS1 and etc. Otherwise this will likely to interact with + # your ~/.zshrc configuration in unexpected ways as the default prompt sets + # a lot of different prompt variables. + autoload -U promptinit && promptinit && prompt suse && setopt prompt_sp + + HISTFILE=~/.histfile + HISTSIZE=1000 + SAVEHIST=1000 + + # bindkey + bindkey -e + + bindkey "\e[3~" delete-char + # Home- und End-Keys. + bindkey '\e[1~' beginning-of-line + bindkey '\e[4~' end-of-line + + # to redo the initial zsh installation run these commands + #autoload -Uz zsh-newuser-install + #zsh-newuser-install -f + ''; + + ohMyZsh.enable = true; + }; +} diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 9eb04e7..112817c 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -52,6 +52,9 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + hyprsunset + hyprpolkitagent + hyprutils # for tiling window manager foot foot.themes From 7f4b1ae8e1bf9c15e6f26f75a2524ba539ac802f Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 13 Jan 2025 03:16:02 +0100 Subject: [PATCH 10/31] shell stuff --- modules/software/shells/fish.nix | 11 ++++++----- modules/software/shells/zsh.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/software/shells/fish.nix b/modules/software/shells/fish.nix index 317e540..b3bb8cd 100644 --- a/modules/software/shells/fish.nix +++ b/modules/software/shells/fish.nix @@ -1,14 +1,15 @@ -{ ... }:{ +{pkgs, ...}: { programs = { fish = { enable = true; useBabelfish = true; shellInit = '' starship init fish | source - ''; + ''; }; - nix-index.enableFishIntegration = true; - direnv.enableFishIntegration = true; - foot.enableFishIntegration = true; + nix-index.enableFishIntegration = true; + direnv.enableFishIntegration = true; + foot.enableFishIntegration = true; }; + environment.systemPackages = [pkgs.starship]; } diff --git a/modules/software/shells/zsh.nix b/modules/software/shells/zsh.nix index eb0baa8..62b4a41 100644 --- a/modules/software/shells/zsh.nix +++ b/modules/software/shells/zsh.nix @@ -1,4 +1,4 @@ -{ ... }:{ +{...}: { system.userActivationScripts.zshrc = "touch .zshrc"; programs.zsh = { From e7de53b2fe16d499ac5eadc70daef762fe804353 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 13 Jan 2025 03:16:43 +0100 Subject: [PATCH 11/31] again random stuff --- flake.nix | 34 +++++++++++++++++++++-- hosts/crocoite/crocoite.nix | 1 + hosts/factorio/factorio.nix | 26 +++++++++++------ hosts/factorio/hardware-configuration.nix | 23 +-------------- modules/accessibility.nix | 5 +++- modules/wm_and_de/default.nix | 2 +- 6 files changed, 56 insertions(+), 35 deletions(-) diff --git a/flake.nix b/flake.nix index 028a561..ecacee4 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ nixpkgs-unstable, nix-flatpak, home-manager, + nixos-generators, ... } @ inputs: let # Supported systems for your flake packages, shell, etc. @@ -70,7 +71,7 @@ overlays = import ./overlays {inherit inputs;}; # Reusable nixos modules you might want to export # These are usually stuff you would upstream into nixpkgs - nixosModules = import ./modules/nixos; + #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; @@ -78,8 +79,7 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = - host_helper "crocoite" # // (host_helper example); - // host_helper "factorio"; + host_helper "crocoite"; # // (host_helper example); ## Standalone home-manager configuration entrypoint ## Available through 'home-manager --flake .#your-username@your-hostname' @@ -94,5 +94,33 @@ # ]; # }; #}; + + packages.x86_64-linux = { + factorio = nixos-generators.nixosGenerate { + system = "x86_64-linux"; + modules = [ + # you can include your own nixos configuration here, i.e. + #./hosts/factorio/factorio.nix + ]; + + customFormats = { + "myFormat" = { + lib, + modulesPath, + ... + }: { + imports = [ + "${toString modulesPath}/virtualisation/proxmox-lxc.nix" + ]; + boot.loader.grub.enable = lib.mkForce false; + boot.loader.systemd-boot.enable = lib.mkForce false; + formatAttr = "tarball"; + fileExtension = "asd.tar.xz"; + }; + }; + format = "myFormat"; + #format = "vmware"; + }; + }; }; } diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index b206c7e..ed33bd9 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -72,6 +72,7 @@ ../../modules/software ../../modules/software/browser ../../modules/software/nix-helper + ../../modules/software/shells ../../modules/wm_and_de diff --git a/hosts/factorio/factorio.nix b/hosts/factorio/factorio.nix index 057ad1f..138f17d 100644 --- a/hosts/factorio/factorio.nix +++ b/hosts/factorio/factorio.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + ... +}: { # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave @@ -47,9 +51,9 @@ ../../modules/locale.nix #../../modules/game/server/factorio/factorio.nix - - - + # + # + # { programs.command-not-found.enable = false; @@ -61,10 +65,16 @@ }; documentation.man.enable = false; documentation.nixos.enable = false; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.ens18.useDHCP = lib.mkDefault true; } ]; - disabledModules = [ - - - ]; + #disabledModules = [ + # + # + #]; } diff --git a/hosts/factorio/hardware-configuration.nix b/hosts/factorio/hardware-configuration.nix index daf8eca..a458278 100644 --- a/hosts/factorio/hardware-configuration.nix +++ b/hosts/factorio/hardware-configuration.nix @@ -8,30 +8,9 @@ modulesPath, ... }: { - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ]; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; - fileSystems."/" = { - device = "/dev/disk/by-uuid/a6c22dab-a82a-4109-a8d0-b7ed99d56bc7"; - fsType = "ext4"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/ca4eedce-6e52-4593-a188-a48e54074d14";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; + # maybe instruct nix to just use available swap partition nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/accessibility.nix b/modules/accessibility.nix index 3347018..b26d138 100644 --- a/modules/accessibility.nix +++ b/modules/accessibility.nix @@ -1,3 +1,6 @@ {...}: { - services.speechd.enable = true; + services = { + speechd.enable = true; + orca.enable = true; + }; } diff --git a/modules/wm_and_de/default.nix b/modules/wm_and_de/default.nix index 1e95e7b..f4baad5 100644 --- a/modules/wm_and_de/default.nix +++ b/modules/wm_and_de/default.nix @@ -1,7 +1,7 @@ {...}: { imports = [ ./hyprland.nix - ./qtile.nix + #./qtile.nix ./components/dbus.nix ]; } From 60531b7ac899762d281dde7130d375e6cc00708b Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 13 Jan 2025 20:54:49 +0100 Subject: [PATCH 12/31] 323 current 2025-01-10 22:36:23 24.11.20250106.3f0a8ac 6.12.2-zen1 * --- modules/software/default.nix | 1 + modules/software/mpv.nix | 29 +++++++++++++++++++++++++++++ modules/software/software.nix | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 modules/software/mpv.nix diff --git a/modules/software/default.nix b/modules/software/default.nix index 760ee11..f162f9a 100644 --- a/modules/software/default.nix +++ b/modules/software/default.nix @@ -8,5 +8,6 @@ ./software.nix ./virt.nix ./android.nix + ./mpv.nix ]; } diff --git a/modules/software/mpv.nix b/modules/software/mpv.nix new file mode 100644 index 0000000..dbc2c04 --- /dev/null +++ b/modules/software/mpv.nix @@ -0,0 +1,29 @@ +{ + pkgs, + home-manager, + ... +}: { + home-manager.programs.mpv = { + enable = true; + + package = ( + pkgs.mpv-unwrapped.wrapper { + scripts = with pkgs.mpvScripts; [ + uosc + sponsorblock + ]; + + mpv = pkgs.mpv-unwrapped.override { + waylandSupport = true; + ffmpeg = pkgs.ffmpeg-full; + }; + } + ); + + config = { + profile = "high-quality"; + ytdl-format = "bestvideo+bestaudio"; + cache-default = 4000000; + }; + }; +} diff --git a/modules/software/software.nix b/modules/software/software.nix index 4706228..c070c7d 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -58,7 +58,6 @@ amberol_wrapper amberol nuclear - mpv #zathura sioyek libreoffice @@ -70,6 +69,7 @@ element-desktop rustdesk-flutter timer + prusa-slicer ]; fonts.packages = with pkgs; [ From a3e04542ba90b685ad0eb208388fb43297d972c4 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 13 Jan 2025 20:58:02 +0100 Subject: [PATCH 13/31] 324 current 2025-01-13 20:57:56 24.11.20250106.3f0a8ac 6.12.2-zen1 * --- modules/software/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/software/default.nix b/modules/software/default.nix index f162f9a..c370586 100644 --- a/modules/software/default.nix +++ b/modules/software/default.nix @@ -8,6 +8,6 @@ ./software.nix ./virt.nix ./android.nix - ./mpv.nix + #./mpv.nix ]; } From 3cfaf56acae1c5f8e3a9d2f595fdae5298beae43 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Tue, 14 Jan 2025 20:40:36 +0100 Subject: [PATCH 14/31] remove amberol_wrapper --- modules/software/software.nix | 119 ++++++++++++++++------------------ 1 file changed, 56 insertions(+), 63 deletions(-) diff --git a/modules/software/software.nix b/modules/software/software.nix index c070c7d..b6f626a 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -4,73 +4,66 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = let - amberol_wrapper = pkgs.writeShellScriptBin "amberol" '' - export GDK_BACKEND='x11' - exec "${pkgs.amberol}/bin/amberol" "$@" - ''; - in - with pkgs; [ - # low level stuff - efibootmgr - #exfat - exfatprogs - greetd.greetd - greetd.tuigreet - killall - vulnix + environment.systemPackages = with pkgs; [ + # low level stuff + efibootmgr + #exfat + exfatprogs + greetd.greetd + greetd.tuigreet + killall + vulnix - # hardware - brightnessctl - usbutils - lm_sensors + # hardware + brightnessctl + usbutils + lm_sensors - unstable.neovim - git - gnumake - gcc - nodePackages.npm - nodejs-slim - python3 - fd - nodejs-slim - cargo - rustc + unstable.neovim + git + gnumake + gcc + nodePackages.npm + nodejs-slim + python3 + fd + nodejs-slim + cargo + rustc - # tooling - htop - ncdu - wget - unstable.yt-dlp - miniserve - file - unzip - tmux - fzf - ripgrep - qemu - home-manager - dfc - p7zip + # tooling + htop + ncdu + wget + unstable.yt-dlp + miniserve + file + unzip + tmux + fzf + ripgrep + qemu + home-manager + dfc + p7zip - # move to homemanager? - unstable.mumble - amberol_wrapper - amberol - nuclear - #zathura - sioyek - libreoffice - #feh - nomacs - #unstable.obsidian - keepassxc - #minecraft - element-desktop - rustdesk-flutter - timer - prusa-slicer - ]; + # move to homemanager? + unstable.mumble + amberol + nuclear + #zathura + sioyek + libreoffice + #feh + nomacs + #unstable.obsidian + keepassxc + #minecraft + element-desktop + rustdesk-flutter + timer + prusa-slicer + ]; fonts.packages = with pkgs; [ noto-fonts From fa162a9f9dff9d09dd248cd6805187b9d5a92da1 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 15 Jan 2025 17:40:52 +0100 Subject: [PATCH 15/31] 325 current 2025-01-15 17:40:45 24.11.20250106.3f0a8ac 6.12.2-zen1 * --- modules/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/firewall.nix b/modules/firewall.nix index a8bca38..d61c660 100644 --- a/modules/firewall.nix +++ b/modules/firewall.nix @@ -3,5 +3,5 @@ networking.firewall.allowedTCPPorts = [8080 10001 10002]; networking.firewall.allowedUDPPorts = [8080 10001 10002]; # Or disable the firewall altogether. - # networking.firewall.enable = false; + networking.firewall.enable = false; } From b70e3c9ce04cad6eb86f179eb311471801e9fbeb Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Wed, 15 Jan 2025 21:32:41 +0100 Subject: [PATCH 16/31] alias for nvim to vi and vim --- modules/software/default.nix | 1 + modules/software/neovim.nix | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 modules/software/neovim.nix diff --git a/modules/software/default.nix b/modules/software/default.nix index c370586..ea3ff15 100644 --- a/modules/software/default.nix +++ b/modules/software/default.nix @@ -9,5 +9,6 @@ ./virt.nix ./android.nix #./mpv.nix + ./neovim.nix ]; } diff --git a/modules/software/neovim.nix b/modules/software/neovim.nix new file mode 100644 index 0000000..a91b259 --- /dev/null +++ b/modules/software/neovim.nix @@ -0,0 +1,7 @@ +{...}: { + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + }; +} From 4c77c7fa05091099e21efe5931302d00c0d5ef62 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 23 Jan 2025 04:45:19 +0100 Subject: [PATCH 17/31] turned on auto login and cleaned up the file --- modules/sec_auth/login-manager.nix | 31 +++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 73c7dcf..0b8344d 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -1,21 +1,30 @@ -{pkgs, ...}: { +{ pkgs, ... }: +let + default_command = "Hyprland"; +in +{ # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; services.greetd = { enable = true; vt = 7; settings = { + initial_session = { + command = default_command; + user = "ranomier"; + }; default_session = { - command = '' ${pkgs.greetd.tuigreet}/bin/tuigreet \ - --time \ - --time-format '%Y-%m-%dT%H:%M:%S %A' \ - --remember \ - --user-menu \ - --user-menu-min-uid 1000 \ - --user-menu-max-uid 2000 \ - --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ - --cmd Hyprland''; - # removed elements from theme: container + command = '' + ${pkgs.greetd.tuigreet}/bin/tuigreet \ + --time \ + --time-format '%Y-%m-%dT%H:%M:%S %A' \ + --remember \ + --user-menu \ + --user-menu-min-uid 1000 \ + --user-menu-max-uid 2000 \ + --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ + --cmd ${default_command} + ''; user = "greeter"; }; }; From da27e178327b6dcba6ebb1cd982b66bbba1bcf3a Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 23 Jan 2025 04:47:33 +0100 Subject: [PATCH 18/31] enabled auto updates on flatpaks --- modules/pkg_mgrmnt/flatpak.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/pkg_mgrmnt/flatpak.nix b/modules/pkg_mgrmnt/flatpak.nix index e960c2b..54b2cef 100644 --- a/modules/pkg_mgrmnt/flatpak.nix +++ b/modules/pkg_mgrmnt/flatpak.nix @@ -2,7 +2,7 @@ services.flatpak = { enable = true; update.auto = { - enable = false; + enable = true; onCalendar = "weekly"; }; uninstallUnmanaged = true; From 57b75b58d79b1a4b3816c8d13d72235b545ab7f2 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 23 Jan 2025 04:49:34 +0100 Subject: [PATCH 19/31] removed basicly empty file --- modules/pkg_mgrmnt/auto_upgrade.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modules/pkg_mgrmnt/auto_upgrade.nix diff --git a/modules/pkg_mgrmnt/auto_upgrade.nix b/modules/pkg_mgrmnt/auto_upgrade.nix deleted file mode 100644 index e69de29..0000000 From b1f2edefe11f2ef199b1f0792288af980bdacd46 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Thu, 23 Jan 2025 04:50:10 +0100 Subject: [PATCH 20/31] changed things with factorio server, but i am still not happy --- flake.nix | 2 +- hosts/factorio/boot.nix | 4 +-- hosts/factorio/factorio.nix | 71 +++++++++++++------------------------ result | 1 + 4 files changed, 29 insertions(+), 49 deletions(-) create mode 120000 result diff --git a/flake.nix b/flake.nix index ecacee4..b3ed743 100644 --- a/flake.nix +++ b/flake.nix @@ -100,7 +100,7 @@ system = "x86_64-linux"; modules = [ # you can include your own nixos configuration here, i.e. - #./hosts/factorio/factorio.nix + ./hosts/factorio/factorio.nix ]; customFormats = { diff --git a/hosts/factorio/boot.nix b/hosts/factorio/boot.nix index ca6a350..0c1d56d 100644 --- a/hosts/factorio/boot.nix +++ b/hosts/factorio/boot.nix @@ -1,6 +1,6 @@ {...}: { # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; + #boot.loader.grub.enable = true; # Define on which hard drive you want to install Grub. - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + #boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only } diff --git a/hosts/factorio/factorio.nix b/hosts/factorio/factorio.nix index 138f17d..371a986 100644 --- a/hosts/factorio/factorio.nix +++ b/hosts/factorio/factorio.nix @@ -1,7 +1,7 @@ -{ - pkgs, - lib, - ... +{ pkgs +, lib +, modulesPath +, ... }: { # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions @@ -9,62 +9,39 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "24.11"; # Did you read the comment? + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - nixpkgs = { - # You can add overlays here - #overlays = with inputs.self.overlays; [ - # Add overlays your own flake exports (from overlays and pkgs dir): - #additions - #modifications - #unstable-packages - - # You can also add overlays exported from other flakes: - # neovim-nightly-overlay.overlays.default - - # Or define it inline, for example: - # (final: prev: { - # hi = final.hello.overrideAttrs (oldAttrs: { - # patches = [ ./change-hello-to-hi.patch ]; - # }); - # }) - #]; - # Configure your nixpkgs instance - config = { + nixpkgs.config = { # Disable if you don't want unfree packages allowUnfree = true; - }; }; - - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, # focused on correctness, usability, and growth – # and committed to doing right by its community. - #nix.package = pkgs.lix; + nix.package = pkgs.lix; + imports = [ #nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1 #./hardware-configuration.nix - ./boot.nix - ./hardware-configuration.nix + #./boot.nix + #./hardware-configuration.nix ../../modules/locale.nix #../../modules/game/server/factorio/factorio.nix - # - # - # - + (modulesPath + "/profiles/perlless.nix") + (modulesPath + "/profiles/minimal.nix") { - programs.command-not-found.enable = false; - environment.defaultPackages = []; - xdg = { - icons.enable = false; - mime.enable = false; - sounds.enable = false; - }; - documentation.man.enable = false; - documentation.nixos.enable = false; + environment.defaultPackages = [ ]; + boot.kernel.enable = false; + boot.isContainer = true; + nixpkgs.overlays = [ (self: super: {}) ]; + } + { + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction @@ -73,8 +50,10 @@ # networking.interfaces.ens18.useDHCP = lib.mkDefault true; } ]; - #disabledModules = [ + disabledModules = [ + (modulesPath + "/profiles/all-hardware.nix") + (modulesPath + "/profiles/base.nix") # # - #]; + ]; } diff --git a/result b/result new file mode 120000 index 0000000..ed40b5d --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/bky8ls2952j8dvnxj4m7rx21y124ky60-tarball \ No newline at end of file From f0753d367e06101afc8ab13ebaffa399a7575c43 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 3 Feb 2025 18:31:36 +0100 Subject: [PATCH 21/31] replaced double variable --- modules/sec_auth/login-manager.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 0b8344d..970f2b9 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -1,8 +1,6 @@ -{ pkgs, ... }: -let +{pkgs, ...}: let default_command = "Hyprland"; -in -{ +in { # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; services.greetd = { From 008475598a16b8cd423a6455e6bd4e81e1c68396 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 3 Feb 2025 18:32:14 +0100 Subject: [PATCH 22/31] comments --- modules/customisation.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/customisation.nix b/modules/customisation.nix index 824f102..65e1092 100644 --- a/modules/customisation.nix +++ b/modules/customisation.nix @@ -1,7 +1,10 @@ {pkgs, ...}: { + # install and set neovim as MANPAGER environment.systemPackages = [pkgs.neovim]; environment.variables = { "MANPAGER" = "nvim +Man!"; + + # set neovim as default editor "EDITOR" = "nvim"; }; } From 60c1d93f4562ed524dabffffc229a0f643324038 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 3 Feb 2025 18:32:46 +0100 Subject: [PATCH 23/31] upd --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d1a4ddc..b696500 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1736334301, - "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", + "lastModified": 1737806078, + "narHash": "sha256-FjgNPBLMCpmwtJT5LiQYkM2lDY+yAmW1ZN1Idx7QeDg=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885", + "rev": "83cc6a28afc4155fd3fe28274f6b5287f51ed2b6", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixlib": { "locked": { - "lastModified": 1734829460, - "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1734915500, - "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { From 48d88c885a0927683634a45a8db60b436ed98f32 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Mon, 3 Feb 2025 18:33:10 +0100 Subject: [PATCH 24/31] formating --- hosts/factorio/factorio.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hosts/factorio/factorio.nix b/hosts/factorio/factorio.nix index 371a986..d5e134b 100644 --- a/hosts/factorio/factorio.nix +++ b/hosts/factorio/factorio.nix @@ -1,7 +1,8 @@ -{ pkgs -, lib -, modulesPath -, ... +{ + pkgs, + lib, + modulesPath, + ... }: { # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions @@ -13,10 +14,10 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.config = { - # Disable if you don't want unfree packages - allowUnfree = true; + # Disable if you don't want unfree packages + allowUnfree = true; }; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = ["nix-command" "flakes"]; # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, # focused on correctness, usability, and growth – @@ -35,13 +36,12 @@ (modulesPath + "/profiles/perlless.nix") (modulesPath + "/profiles/minimal.nix") { - environment.defaultPackages = [ ]; + environment.defaultPackages = []; boot.kernel.enable = false; boot.isContainer = true; - nixpkgs.overlays = [ (self: super: {}) ]; + nixpkgs.overlays = [(self: super: {})]; } { - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction @@ -53,7 +53,7 @@ disabledModules = [ (modulesPath + "/profiles/all-hardware.nix") (modulesPath + "/profiles/base.nix") - # - # + # + # ]; } From 6619aa33aebfaa27969118b0cd5826c5a2cb2abf Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 22 Feb 2025 21:09:08 +0100 Subject: [PATCH 25/31] cleaned up unneeded comments --- modules/software/game.nix | 55 ++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/modules/software/game.nix b/modules/software/game.nix index eebdd19..00944e9 100644 --- a/modules/software/game.nix +++ b/modules/software/game.nix @@ -1,37 +1,28 @@ -{pkgs, ...}: { - #environment.systemPackages = with pkgs; [ ]; - # hardware.steam-hardware.enable = true; # Note that this is already enabled with programs.steam.enable = true; +{ pkgs, ... }: { programs.steam = { enable = true; - remotePlay.openFirewall = - true; # Open ports in the firewall for Steam Remote Play - dedicatedServer.openFirewall = - true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = - true; # Open ports in the firewall for Steam Local Network Game Transfers + + # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + + # Open ports in the firewall for Source Dedicated Server + dedicatedServer.openFirewall = true; + + # Open ports in the firewall for Steam Local Network Game Transfers + localNetworkGameTransfers.openFirewall = true; + + # enables a extra session for the login screen (get steam deck behavior) + gamescopeSession.enable = true; + + # make proton-ge alway available + extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; - programs.steam.gamescopeSession.enable = true; - #### FHS environment only - # This will only make partial installation - provide the script, which creates the typical environment expected by proprietary games and software on regular Linux, allowing to run such software without patching. Useful if you plan to run games downloaded from the internet. - # Note that this is not necessary for clients installed from Nixpkgs (like Minigalaxy or Itch), which already use the FHS environment. - # There are two options to install the FHS environment. The first is to install steam-run. - #Example snippet of configuration.nix: + # steam-run: Run commands in the same FHS environment that is used for Steam + environment.systemPackages = with pkgs; [ steam-run ]; - # environment.systemPackages = with pkgs; [ - # steam-run - # ]; - - # Another option, in case you need more flexibility, is to directly reference the part of steam metapackage. - - # Example snippet of configuration.nix: - - # environment.systemPackages = with pkgs; [ - # (steam.override { /* Your overrides here */ }).run - # ]; - # Install the game by setting the executable attribute on the installer and then running it via steam-run ./your_installer.sh. After installation, edit the "~/.local/share/applications/your_game.desktop" and replace the exec line from Exec="/home/user/game/start.sh" "" with Exec="steam-run" "/home/user/game/start.sh". - - environment.systemPackages = with pkgs; [steam-run]; - - programs.steam.extraCompatPackages = with pkgs; [proton-ge-bin]; -} + # Note that this is already enabled with programs.steam.enable = true; + # but it might be usefull on systems without steam, + # while still using steam hardware + #hardware.steam-hardware.enable = true; + } From 3e0aa3b39d7353291735e38bd74fb08e4546c6ed Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 22 Feb 2025 21:09:52 +0100 Subject: [PATCH 26/31] added etlegacy --- modules/software/flatpak.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/software/flatpak.nix b/modules/software/flatpak.nix index 5480176..16af41f 100644 --- a/modules/software/flatpak.nix +++ b/modules/software/flatpak.nix @@ -45,6 +45,12 @@ appId = "io.github.Soundux"; } # soundboard + # games + { + origin = "flathub"; + appId = "com.etlegacy.ETLegacy"; + } # shooter + #"com.obsproject.Studio" #this is another way to write it ]; }; From 16795211fa3899fcf0f02df2ef9620bab8638444 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 22 Feb 2025 21:23:29 +0100 Subject: [PATCH 27/31] locketeti lock lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index b696500..b2469bc 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1737806078, - "narHash": "sha256-FjgNPBLMCpmwtJT5LiQYkM2lDY+yAmW1ZN1Idx7QeDg=", + "lastModified": 1739444422, + "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "83cc6a28afc4155fd3fe28274f6b5287f51ed2b6", + "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { From 61319d320e9fe6cc63cc43a986cc42ee9f1896e5 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 22 Feb 2025 21:28:43 +0100 Subject: [PATCH 28/31] made office module and added spell checking --- hosts/crocoite/crocoite.nix | 1 + modules/software/office/default.nix | 5 +++++ modules/software/office/libreoffice.nix | 8 ++++++++ modules/software/software.nix | 1 - 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 modules/software/office/default.nix create mode 100644 modules/software/office/libreoffice.nix diff --git a/hosts/crocoite/crocoite.nix b/hosts/crocoite/crocoite.nix index ed33bd9..c48608e 100644 --- a/hosts/crocoite/crocoite.nix +++ b/hosts/crocoite/crocoite.nix @@ -73,6 +73,7 @@ ../../modules/software/browser ../../modules/software/nix-helper ../../modules/software/shells + ../../modules/software/office ../../modules/wm_and_de diff --git a/modules/software/office/default.nix b/modules/software/office/default.nix new file mode 100644 index 0000000..786c7ca --- /dev/null +++ b/modules/software/office/default.nix @@ -0,0 +1,5 @@ +{...}: { + imports = [ + ./libreoffice.nix + ]; +} diff --git a/modules/software/office/libreoffice.nix b/modules/software/office/libreoffice.nix new file mode 100644 index 0000000..51393d2 --- /dev/null +++ b/modules/software/office/libreoffice.nix @@ -0,0 +1,8 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + libreoffice + hunspell + hunspellDicts.en_UK + hunspellDicts.de_DE + ]; +} diff --git a/modules/software/software.nix b/modules/software/software.nix index b6f626a..6e3bc59 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -53,7 +53,6 @@ nuclear #zathura sioyek - libreoffice #feh nomacs #unstable.obsidian From c97ee80ee09eeb8aa5f861948fa842e722dd8db5 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 1 Mar 2025 20:34:54 +0100 Subject: [PATCH 29/31] btop --- modules/software/software.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/software/software.nix b/modules/software/software.nix index 6e3bc59..b7c8920 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -33,6 +33,7 @@ # tooling htop + btop ncdu wget unstable.yt-dlp From b8aa94fcdc670b25b1814cd91a51efd7884a5130 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 1 Mar 2025 20:35:14 +0100 Subject: [PATCH 30/31] formating --- modules/software/game.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/software/game.nix b/modules/software/game.nix index 00944e9..87313f6 100644 --- a/modules/software/game.nix +++ b/modules/software/game.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{pkgs, ...}: { programs.steam = { enable = true; @@ -15,14 +15,14 @@ gamescopeSession.enable = true; # make proton-ge alway available - extraCompatPackages = with pkgs; [ proton-ge-bin ]; + extraCompatPackages = with pkgs; [proton-ge-bin]; }; # steam-run: Run commands in the same FHS environment that is used for Steam - environment.systemPackages = with pkgs; [ steam-run ]; + environment.systemPackages = with pkgs; [steam-run]; # Note that this is already enabled with programs.steam.enable = true; # but it might be usefull on systems without steam, # while still using steam hardware #hardware.steam-hardware.enable = true; - } +} From fb4f531bb1334da3911ee0e2ac3d4fd2708fe19f Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 1 Mar 2025 20:35:27 +0100 Subject: [PATCH 31/31] libreoffice spelling --- modules/software/office/libreoffice.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/software/office/libreoffice.nix b/modules/software/office/libreoffice.nix index 51393d2..3e04503 100644 --- a/modules/software/office/libreoffice.nix +++ b/modules/software/office/libreoffice.nix @@ -2,7 +2,7 @@ environment.systemPackages = with pkgs; [ libreoffice hunspell - hunspellDicts.en_UK + hunspellDicts.en_GB-large hunspellDicts.de_DE ]; }