diff --git a/flake.lock b/flake.lock index 1a6f95b..63e5de6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1745557122, - "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "owner": "nix-community", "repo": "home-manager", - "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", + "rev": "50eee705bbdbac942074a8c120e8194185633675", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746621361, + "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -106,11 +106,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745921652, - "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { diff --git a/hostHelper.nix b/hostHelper.nix index b096499..3602016 100644 --- a/hostHelper.nix +++ b/hostHelper.nix @@ -1,17 +1,16 @@ -inArgs: hostname: hostOptions: -let +inArgs: hostname: hostOptions: let nixosSystem = if (hostOptions ? unstable && hostOptions.unstable) - then inArgs.nixos-unstable.lib.nixosSystem - else inArgs.nixpkgs.lib.nixosSystem; + then inArgs.nixos-unstable.lib.nixosSystem + else inArgs.nixpkgs.lib.nixosSystem; in nixosSystem { specialArgs = {inherit inArgs;}; modules = [ - {networking.hostName = hostname;} - (./hosts/${hostname}) - + ./hosts/${hostname} { + networking.hostName = hostname; + # 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/hosts/crocoite/default.nix b/hosts/crocoite/default.nix index 0859c5d..2b546da 100644 --- a/hosts/crocoite/default.nix +++ b/hosts/crocoite/default.nix @@ -5,7 +5,6 @@ nixos-unstable, ... }: { - #nixpkgs.overlays = [ overlays.unstable-packages ]; nixpkgs = { # You can add overlays here @@ -25,11 +24,8 @@ # }); # }) ]; - }; - - imports = [ # steam and other stuff seems to depend on perl #"${modulesPath}/profiles/perlless.nix" @@ -57,7 +53,7 @@ ../../modules/wm_and_de ../../modules/pkg_mgrmnt - + ../../system_profiles/defaults.nix # ../../tests ]; diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix index 234c358..9072876 100644 --- a/hosts/game-luanti/default.nix +++ b/hosts/game-luanti/default.nix @@ -4,13 +4,10 @@ modulesPath, ... }: { - - imports = [ ./hardware-configuration.nix ../../system_profiles/defaults.nix ../../system_profiles/mini-container.nix - ]; } diff --git a/hosts/game-luanti/hardware-configuration.nix b/hosts/game-luanti/hardware-configuration.nix index 1a421a1..f8c86aa 100644 --- a/hosts/game-luanti/hardware-configuration.nix +++ b/hosts/game-luanti/hardware-configuration.nix @@ -1,6 +1,3 @@ -{ - lib, - ... -}: { +{lib, ...}: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hosts/jitsi/default.nix b/hosts/jitsi/default.nix index f76da0b..1893723 100644 --- a/hosts/jitsi/default.nix +++ b/hosts/jitsi/default.nix @@ -9,7 +9,6 @@ allowUnfree = true; }; - imports = [ ./hardware-configuration.nix diff --git a/hosts/jitsi/hardware-configuration.nix b/hosts/jitsi/hardware-configuration.nix index 1a421a1..f8c86aa 100644 --- a/hosts/jitsi/hardware-configuration.nix +++ b/hosts/jitsi/hardware-configuration.nix @@ -1,6 +1,3 @@ -{ - lib, - ... -}: { +{lib, ...}: { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/firewall.nix b/modules/firewall.nix index cc4dba0..f8cb4bb 100644 --- a/modules/firewall.nix +++ b/modules/firewall.nix @@ -1,9 +1,9 @@ { networking.firewall = { - enable = false; + enable = false; - # Open ports in the firewall. - allowedTCPPorts = [8080 10001 10002]; - allowedUDPPorts = [8080 10001 10002]; + # Open ports in the firewall. + allowedTCPPorts = [8080 10001 10002]; + allowedUDPPorts = [8080 10001 10002]; }; } diff --git a/modules/pkg_mgrmnt/podman.nix b/modules/pkg_mgrmnt/podman.nix index ee82a11..96379cf 100644 --- a/modules/pkg_mgrmnt/podman.nix +++ b/modules/pkg_mgrmnt/podman.nix @@ -1,7 +1,8 @@ {pkgs, ...}: { # Enable common container config files in /etc/containers - virtualisation.containers.enable = true; virtualisation = { + containers.enable = true; + podman = { enable = true; @@ -15,8 +16,6 @@ }; }; - environment.sessionVariables = { - }; # Useful other development tools environment.systemPackages = with pkgs; [ dive # look into docker image layers diff --git a/modules/pkg_mgrmnt/store_pkg_file.nix b/modules/pkg_mgrmnt/store_pkg_file.nix index 1eb7d31..4f4e02b 100644 --- a/modules/pkg_mgrmnt/store_pkg_file.nix +++ b/modules/pkg_mgrmnt/store_pkg_file.nix @@ -10,4 +10,5 @@ formatted = builtins.concatStringsSep "\n" sortedUnique; in formatted; + # TODO: in the far future: add a little alias that greps throgh that file } diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 970f2b9..c9d208b 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -1,8 +1,6 @@ {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; diff --git a/modules/sec_auth/ssh.nix b/modules/sec_auth/ssh.nix index 6613cc3..5f8a774 100644 --- a/modules/sec_auth/ssh.nix +++ b/modules/sec_auth/ssh.nix @@ -6,17 +6,10 @@ askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass"; }; - # This is using a rec (recursive) expression to set and access XDG_BIN_HOME within the expression - # For more on rec expressions see https://nix.dev/tutorials/first-steps/nix-language#recursive-attribute-set-rec environment.sessionVariables = { SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/ssh-agent"; }; - environment.systemPackages = with pkgs; [ - #ssh-askpass-fullscreen - lxqt.lxqt-openssh-askpass - ]; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; diff --git a/modules/software/browser/brave.nix b/modules/software/browser/brave.nix index 04560ef..751639f 100644 --- a/modules/software/browser/brave.nix +++ b/modules/software/browser/brave.nix @@ -1,5 +1,3 @@ {pkgs, ...}: { - environment.systemPackages = with pkgs; [ - brave - ]; + environment.systemPackages = [pkgs.brave]; } diff --git a/modules/software/flatpak.nix b/modules/software/flatpak.nix index 968a64f..830250e 100644 --- a/modules/software/flatpak.nix +++ b/modules/software/flatpak.nix @@ -2,60 +2,68 @@ services.flatpak = { packages = [ { + # flatpak permisssion gui origin = "flathub"; appId = "com.github.tchx84.Flatseal"; - } # flatpak permisssion gui - { - origin = "flathub"; - appId = "com.mojang.Minecraft"; - } # Lego for adults - { - origin = "flathub"; - appId = "de.schmidhuberj.DieBahn"; - } # Public transport connection viewer - { - origin = "flathub"; - appId = "com.github.hugolabe.Wike"; - } # Wikpedia, but in nice + } { + # Local chat AI origin = "flathub"; appId = "io.gpt4all.gpt4all"; - } # Local chat AI + } { + # note taking and brain organising origin = "flathub"; appId = "md.obsidian.Obsidian"; - } # note taking and brain organising + } { + # remote dekstop origin = "flathub"; appId = "com.parsecgaming.parsec"; - } # remote dekstop + } + { + # electron media player (youtube and co) + origin = "flathub"; + appId = "org.js.nuclear.Nuclear"; + } # messenger { + # good e2ee, but centralized origin = "flathub"; appId = "org.signal.Signal"; } { + # bad/no e2ee, but centralized :3 origin = "flathub"; appId = "org.telegram.desktop"; } { + # discord, no privacy origin = "flathub"; appId = "dev.vencord.Vesktop"; - } # More usable discord for linux + } { + # soundboard for chat apps origin = "flathub"; appId = "io.github.Soundux"; - } # soundboard + } # games { + # shooter origin = "flathub"; appId = "com.etlegacy.ETLegacy"; - } # shooter + } { + # Lego for adults origin = "flathub"; - appId = "org.js.nuclear.Nuclear"; + appId = "com.mojang.Minecraft"; + } + { + # Lego for real adults + origin = "flathub"; + appId = "net.minetest.Minetest"; } #"com.obsproject.Studio" #this is another way to write it diff --git a/modules/software/fonts.nix b/modules/software/fonts.nix index ed1f806..1d1c26e 100644 --- a/modules/software/fonts.nix +++ b/modules/software/fonts.nix @@ -13,7 +13,11 @@ fira-code-symbols #droid-sans-mono (nerdfonts.override { - fonts = ["FiraCode" "DroidSansMono" "JetBrainsMono"]; + fonts = [ + "FiraCode" + "DroidSansMono" + "JetBrainsMono" + ]; }) ]; } diff --git a/modules/software/packages.nix b/modules/software/packages.nix index 2642393..8e7ea71 100644 --- a/modules/software/packages.nix +++ b/modules/software/packages.nix @@ -15,7 +15,11 @@ lm_sensors unstable.neovim + git + gitui + lazygit + gnumake gcc nodePackages.npm diff --git a/modules/software/shells/fish.nix b/modules/software/shells/fish.nix index 1d8a994..638cb80 100644 --- a/modules/software/shells/fish.nix +++ b/modules/software/shells/fish.nix @@ -3,9 +3,6 @@ fish = { enable = true; useBabelfish = true; - shellInit = '' - starship init fish | source - ''; }; nix-index.enableFishIntegration = true; direnv.enableFishIntegration = true; diff --git a/outputs.nix b/outputs.nix index 4fce707..aab3468 100644 --- a/outputs.nix +++ b/outputs.nix @@ -10,7 +10,6 @@ inArgs: let # This is a function that generates an attribute by calling a function you # pass to it, with each system as an argument forAllSystems = inArgs.nixpkgs.lib.genAttrs systems; - in { # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#your-hostname' @@ -18,10 +17,12 @@ in { crocoite = {stateVersion = "24.05";}; jitsi = {stateVersion = "24.11";}; - game-luanti = {stateVersion = "25.05"; unstable = true;}; + game-luanti = { + stateVersion = "25.05"; + unstable = true; + }; }; - # Your custom packages # Accessible through 'nix build', 'nix shell', etc #packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); diff --git a/system_profiles/defaults.nix b/system_profiles/defaults.nix index 51652c0..8fb3c00 100644 --- a/system_profiles/defaults.nix +++ b/system_profiles/defaults.nix @@ -9,9 +9,9 @@ nixpkgs.config.allowUnfree = lib.mkDefault true; nix = { - # 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. + # 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. package = lib.mkDefault pkgs.lix; channel.enable = lib.mkDefault false; diff --git a/system_profiles/mini-container.nix b/system_profiles/mini-container.nix index 275ef92..ce05d95 100644 --- a/system_profiles/mini-container.nix +++ b/system_profiles/mini-container.nix @@ -1,13 +1,6 @@ -{ - lib, - ... -}: { - imports = [ - ./mini.nix +{lib, ...}: { + boot.isContainer = lib.mkDefault true; + boot.kernel.enable = lib.mkDefault false; - { - boot.isContainer = lib.mkDefault true; - boot.kernel.enable = lib.mkDefault false; - } - ]; + imports = [./mini.nix]; }