From e38cb608c3123a21dce2b065897d731bf378d0d5 Mon Sep 17 00:00:00 2001 From: 4DBug Date: Sat, 22 Mar 2025 16:27:01 -0500 Subject: [PATCH] push --- core/audio.nix | 6 ++--- core/boot.nix | 8 +++--- core/core.nix | 5 ++-- core/graphics.nix | 4 +-- core/locale.nix | 6 ++--- core/network.nix | 10 +++---- core/nix.nix | 7 +++-- core/security.nix | 6 ++--- core/user.nix | 6 ++--- gnome.nix | 4 +-- main.nix | 5 ++-- packages/flatpak.nix | 5 ++-- packages/packages.nix | 17 ++++++------ packages/system.nix | 18 ++++++++++--- packages/user.nix | 61 +++++++++++++++++++++++-------------------- theming.nix | 11 ++++---- 16 files changed, 91 insertions(+), 88 deletions(-) diff --git a/core/audio.nix b/core/audio.nix index 5e2ce38..fb07ac4 100644 --- a/core/audio.nix +++ b/core/audio.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ ... }: -{ +{ hardware.pulseaudio.enable = false; services.pipewire = { @@ -13,4 +13,4 @@ jack.enable = true; }; -} \ No newline at end of file +} diff --git a/core/boot.nix b/core/boot.nix index 993e926..0a2d389 100644 --- a/core/boot.nix +++ b/core/boot.nix @@ -1,10 +1,8 @@ +{ ... }: - -{ config, ... }: - -{ +{ boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; -} \ No newline at end of file +} diff --git a/core/core.nix b/core/core.nix index c7cf0cd..9ba061f 100644 --- a/core/core.nix +++ b/core/core.nix @@ -1,5 +1,4 @@ - -{ config, ... }: +{ ... }: { imports = [ @@ -12,4 +11,4 @@ ./boot.nix ./security.nix ]; -} \ No newline at end of file +} diff --git a/core/graphics.nix b/core/graphics.nix index fbc3c1b..2317ec5 100644 --- a/core/graphics.nix +++ b/core/graphics.nix @@ -1,6 +1,6 @@ { config, ... }: -{ +{ services.xserver.videoDrivers = ["nvidia"]; hardware = { @@ -17,4 +17,4 @@ package = config.boot.kernelPackages.nvidiaPackages.beta; }; }; -} \ No newline at end of file +} diff --git a/core/locale.nix b/core/locale.nix index 7036886..146220b 100644 --- a/core/locale.nix +++ b/core/locale.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ ... }: -{ +{ time.timeZone = "America/Chicago"; i18n = { @@ -17,4 +17,4 @@ LC_TIME = "en_US.UTF-8"; }; }; -} \ No newline at end of file +} diff --git a/core/network.nix b/core/network.nix index a203f1b..7ad3062 100644 --- a/core/network.nix +++ b/core/network.nix @@ -1,10 +1,8 @@ +{ ... }: - -{ config, ... }: - -{ +{ networking = { - hostName = "nix"; + hostName = "nix"; networkmanager.enable = true; }; -} \ No newline at end of file +} diff --git a/core/nix.nix b/core/nix.nix index 8f803af..59b6473 100644 --- a/core/nix.nix +++ b/core/nix.nix @@ -1,7 +1,6 @@ +{ ... }: -{ config, ... }: - -{ +{ system.stateVersion = "24.11"; nix.settings.experimental-features = [ "nix-command" "flakes" ]; -} \ No newline at end of file +} diff --git a/core/security.nix b/core/security.nix index fdedca8..9399452 100644 --- a/core/security.nix +++ b/core/security.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ ... }: -{ +{ security = { rtkit.enable = true; @@ -9,4 +9,4 @@ wheelNeedsPassword = false; }; }; -} \ No newline at end of file +} diff --git a/core/user.nix b/core/user.nix index f828e9c..da693dd 100644 --- a/core/user.nix +++ b/core/user.nix @@ -1,9 +1,9 @@ -{ config, ... }: +{ ... }: -{ +{ users.users.bug = { isNormalUser = true; description = "Bug"; extraGroups = [ "networkmanager" "wheel" ]; }; -} \ No newline at end of file +} diff --git a/gnome.nix b/gnome.nix index 2074b49..b241f19 100644 --- a/gnome.nix +++ b/gnome.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs.gnomeExtensions; [ @@ -33,4 +33,4 @@ services."getty@tty1".enable = false; services."autovt@tty1".enable = false; }; -} \ No newline at end of file +} diff --git a/main.nix b/main.nix index 829106c..a6a5f9e 100644 --- a/main.nix +++ b/main.nix @@ -1,5 +1,4 @@ - -{ config, lib, pkgs, ... }: +{ ... }: { imports = [ @@ -8,4 +7,4 @@ ./gnome.nix ./theming.nix ]; -} \ No newline at end of file +} diff --git a/packages/flatpak.nix b/packages/flatpak.nix index 58719c9..ae696da 100644 --- a/packages/flatpak.nix +++ b/packages/flatpak.nix @@ -1,5 +1,4 @@ - -{ config, lib, pkgs, ... }: +{ ... }: { services.flatpak.packages = [ @@ -16,4 +15,4 @@ "org.pipewire.Helvum" "io.github.giantpinkrobots.flatsweep" ]; -} \ No newline at end of file +} diff --git a/packages/packages.nix b/packages/packages.nix index 935b2c8..292d523 100644 --- a/packages/packages.nix +++ b/packages/packages.nix @@ -1,5 +1,4 @@ - -{ config, lib, pkgs, ... }: +{ lib, ... }: { imports = [ @@ -9,7 +8,7 @@ ]; nixpkgs.config.allowUnfree = true; - + services.flatpak = { enable = true; @@ -32,16 +31,16 @@ pico = "ssh pico.sh"; # tuns name port - tuns = "bash -c '\''if [ \"$#\" -ne 2 ]; then echo \"Usage: tun name port\"; exit 1; fi; -if [[ \"$1\" =~ ^[0-9]+$ ]]; then port=\"$1\"; name=\"$2\"; -elif [[ \"$2\" =~ ^[0-9]+$ ]]; then port=\"$2\"; name=\"$1\"; -else echo \"Error: One argument must be a number (port)\"; exit 1; fi; + tuns = "bash -c '\''if [ \"$#\" -ne 2 ]; then echo \"Usage: tun name port\"; exit 1; fi; +if [[ \"$1\" =~ ^[0-9]+$ ]]; then port=\"$1\"; name=\"$2\"; +elif [[ \"$2\" =~ ^[0-9]+$ ]]; then port=\"$2\"; name=\"$1\"; +else echo \"Error: One argument must be a number (port)\"; exit 1; fi; ssh -R \"$\{name}:80:localhost:$\{port}\" tuns.sh'\'' _"; # pgs name directory pgs = "bash -c '\''if [ \"$#\" -ne 2 ]; then echo \"Usage: pgs NAME DIRECTORY\"; exit 1; fi; rsync -rv \"$2\" pgs.sh:/\"$1\"'\'' _"; }; - + dconf.enable = lib.mkDefault true; firefox.enable = true; @@ -69,4 +68,4 @@ ssh -R \"$\{name}:80:localhost:$\{port}\" tuns.sh'\'' _"; dataDir = "/home/bug/"; }; }; -} \ No newline at end of file +} diff --git a/packages/system.nix b/packages/system.nix index d218647..cf764dc 100644 --- a/packages/system.nix +++ b/packages/system.nix @@ -1,16 +1,26 @@ - -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ home-manager + git wget + + # compiling gcc + gnumake + + # network nmap inetutils sshs - gnumake + + # input testing evtest + + # nix language server + nixd + nil ]; -} \ No newline at end of file +} diff --git a/packages/user.nix b/packages/user.nix index 58443ef..d43bfeb 100644 --- a/packages/user.nix +++ b/packages/user.nix @@ -1,17 +1,12 @@ - -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { users.users.bug.packages = with pkgs; [ + # ide vscode + zed-editor - go - - (python3.withPackages (ps: with ps; [ - pip - pynput - python-uinput - ])) + # languages luau @@ -22,36 +17,44 @@ jsregexp ])) + go + + (python3.withPackages (ps: with ps; [ + pip + pynput + python-uinput + ])) + nodejs + # 3D blender plasticity + # video kdenlive + # markdown / notes + obsidian + + # social + vesktop + + # music + nicotine-plus + furnace + pulseaudio + + # utilties + mapscii + cloudflared + base16-schemes + ptyxis + ## rpi-imager neofetch fastfetch - tree gnome-tweaks wine - - obsidian - - vesktop - nicotine-plus - furnace - - pulseaudio - - # rpi-imager - - mapscii - - cloudflared - - base16-schemes - - ptyxis ]; -} \ No newline at end of file +} diff --git a/theming.nix b/theming.nix index 66f60d5..fd56544 100644 --- a/theming.nix +++ b/theming.nix @@ -1,15 +1,14 @@ +{ pkgs, ... }: -{ config, pkgs, ... }: - -{ +{ fonts = { fontDir.enable = true; enableDefaultPackages = true; - packages = with pkgs; [ + packages = with pkgs; [ twitter-color-emoji ]; - + fontconfig = { enable = true; useEmbeddedBitmaps = true; @@ -19,4 +18,4 @@ }; }; }; -} \ No newline at end of file +}