diff --git a/modules/core/configuration.nix b/modules/core/configuration.nix index 1130fcb..0e0bd0f 100755 --- a/modules/core/configuration.nix +++ b/modules/core/configuration.nix @@ -2,74 +2,8 @@ { imports = [ - ./home - ./modules ]; - # nixpkgs.config = { - # allowUnfree = true; - # permittedInsecurePackages = [ - # "schildichat-web-1.11.30-sc.2" - # "electron-25.9.0" - # "nix-2.15.3" - # ]; - # }; - - # nix options - # nix = { - # settings = { - # cores = 0; - # auto-optimise-store = true; - # allowed-users = [ "@wheel" ]; - # experimental-features = [ - # "nix-command" - # "flakes" - # ]; - # }; - # }; - - system.autoUpgrade = { - enable = true; - channel = "https://nixos.org/channels/nixos-23.11"; - }; - - # Bootloader. - boot = { - # loader = { - # systemd-boot.enable = true; - # systemd-boot.configurationLimit = 5; - # efi.canTouchEfiVariables = true; - # }; - # plymouth.enable = true; - initrd = { - # systemd.enable = true; - # secrets = { - # "/crypto_keyfile.bin" = null; - # }; - # kernelParams = [ - # "quiet" - # ]; - # kernel.sysctl = { - # "kernel.sysrq" = 1; - # }; - luks = { - # devices."luks-uuid" = { - # device = "/dev/disk/by-uuid/luks-uuid"; - # }; - }; - }; - }; - - # Run appimages normally - boot.binfmt.registrations.appimage = { - wrapInterpreterInShell = false; - interpreter = "${pkgs.appimage-run}/bin/appimage-run"; - recognitionType = "magic"; - offset = 0; - mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff''; - magicOrExtension = ''\x7fELF....AI\x02''; - }; - security = { sudo.execWheelOnly = true; }; @@ -132,14 +66,6 @@ # media-session.enable = true; }; - environment.variables = { - NIXOS_OZONE_WL = "1"; - NIXPKGS_ALLOW_UNFREE = "1"; - PATH = [ - "\${HOME}/.local/bin" - "\${HOME}/.config/rofi/scripts" - ]; - }; environment.systemPackages = with pkgs; [ @@ -220,23 +146,27 @@ flatpak.enable = true; - udev.packages = with pkgs; [ + # udev.packages = with pkgs; [ # yubikey-personalization - ]; + # ]; + locate = { enable = false; package = pkgs.plocate; localuser = null; }; + printing = { enable = false; - # drivers = with pkgs; [ gutenprint hll2390dw-cups ]; + # drivers = with pkgs; [ uwu-driver-cups ]; }; + avahi = { enable = false; nssmdns = false; openFirewall = false; }; + openssh = { enable = false; }; diff --git a/modules/core/home.nix b/modules/core/home.nix new file mode 100755 index 0000000..9457b60 --- /dev/null +++ b/modules/core/home.nix @@ -0,0 +1,65 @@ +{ pkgs, inputs, lib, osConfig, ... }: + +let + packages = with pkgs; [ + fish + ]; +in +{ + imports = [ + inputs.home-manager.nixosModules.home-manager + ]; + home-manager = { + userUserPackages = true; + userGlobalPackages = true; + extraSpecialArgs = { inherit inputs; }; + users.serenity = { + imports = [ (import ./../home) ]; + home.username = "serenity"; + home.homeDirectory = "/home/serenity"; + home.stateVersion = "23.11"; + programs = { + home-manager.enable = true; + direnv = { + enable = true; + nix-direnv.enable = true; + config.load_dotenv = false; + }; + }; + programs.home-manager.enable = true; + }; + }; + + users.users.serenity = { + isNormalUser = true; + description = "Serenity"; + extraGroups = [ + "networkmanager" + "wheel" + ]; + shell = pkgs.fish; + }; + # Copy some files to where they go + # home.file.scripts = { + # source = ./scripts; + # target = ".local/bin/scripts"; + # }; + # Installing muir packages uvu + # home.packages = with pkgs; [ + # - Multimedia + # spotify + # nicotine-plus + # jellyfin-media-player + # gimp + # krita + # inkscape + # obs + # ardour + # - Web & Chat + # fractal + # schildichat-desktop + # - Coding + # vscodium + # gitui + # ]; +} diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix index a80467d..443e897 100644 --- a/modules/core/packages/default.nix +++ b/modules/core/packages/default.nix @@ -47,6 +47,21 @@ ]; }; - system.stateVersion = "23.11"; - + boot.binfmt.registrations.appimage = { + wrapInterpreterInShell = false; + interpreter = "${pkgs.appimage-run}/bin/appimage-run"; + recognitionType = "magic"; + offset = 0; + mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'' + magicOrExtension = ''\x7fELF....AI\x02''; + }; + + system = { + stateVersion = "23.11"; + # autoUpgrade = { + # enable = true; + # channel = "INSERT_CHANNEL"; + # }; + }; + } diff --git a/modules/home.nix b/modules/home.nix deleted file mode 100755 index 3ae52d2..0000000 --- a/modules/home.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, lib, osConfig, ... }: - -{ - - imports = [ - # ./users - ./home - ]; - - programs.home-manager.enable = true; - - # Copy some files to where they go - # home.file.scripts = { - # source = ./scripts; - # target = ".local/bin/scripts"; - # }; - - # Installing muir packages uvu - home.packages = with pkgs; [ - - # - Multimedia - spotify - # nicotine-plus - # jellyfin-media-player - # gimp - # krita - # inkscape - # obs - # ardour - - # - Web & Chat - # fractal - schildichat-desktop - - # - Coding - # vscodium - # gitui - - ]; - - - # Configure muir programs - - programs = { - direnv = { - enable = true; - nix-direnv.enable = true; - config.load_dotenv = false; - }; - }; - - # don't uh, change this or something might break lol idk - home.stateVersion = "23.11"; -} diff --git a/modules/users/default.nix b/modules/users/default.nix deleted file mode 100644 index d1099f0..0000000 --- a/modules/users/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, pkgs, osConfig, ...} - -{ - - imports = [ - ./serenity.nix - ]; - -} diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix deleted file mode 100644 index 997b99f..0000000 --- a/modules/users/serenity.nix +++ /dev/null @@ -1 +0,0 @@ -# EMPTY FOR NOW