From 48bc7c14a04bfd150fe4a3b4ca8471f827348dc4 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sat, 16 Nov 2024 11:03:53 +1000 Subject: [PATCH] i cant rember oof --- core/display.nix | 44 ++++++++--- core/gaming.nix | 3 +- core/packages.nix | 129 +++++++++++--------------------- home/desktop/common/default.nix | 88 ++++++++++++---------- 4 files changed, 129 insertions(+), 135 deletions(-) diff --git a/core/display.nix b/core/display.nix index 4ab3ffe..7131558 100644 --- a/core/display.nix +++ b/core/display.nix @@ -8,17 +8,21 @@ #./sddm-config.nix ]; - ## xserver still needed for xwayland stuff - services.xserver.enable = true; - - ## Current login greeter/display manager, - ## set to run wayland. - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - }; + services = { + ## xserver still needed for xwayland stuff + xserver.enable = true; + ## Current login greeter/display manager, + ## set to run wayland. + displayManager = { + enable = true; + #defaultSession = "sway"; + sddm = { + enable = true; + wayland.enable = true; + }; + }; ## Eventual login greeter/display manager, ## wayland native. #services.greetd = { @@ -28,6 +32,26 @@ #}; #}; + ## Virtual filesystem, needed this for something i think ? + gvfs.enable = true; + gnome = { + ## File previewer for nautilus + sushi.enable = true + ## "core utilities" + core-utilities.enable = true; + ## GNOME keyring + gnome-keyring.enable = true; + ## Makes all of /Public available over network + gnome-user-share.enable = true; + ## GUI system settings ? + gnome-settings-daemon.enable = true; + }; + + }; + + ## Dunno if i did this right, but possible needed for keyring/polkit stuff ? + security.pam.services.serenity.enableGnomeKeyring = true; + programs = { ## Eventual login greeter/display manager, @@ -64,6 +88,8 @@ }; environment.systemPackages = with pkgs; [ + xorg.xhost + #dconf # redundant, adding for completeness dconf-editor # For editing dconf settings graphically #xdg-utils #xdg-desktop-portal diff --git a/core/gaming.nix b/core/gaming.nix index 61819b7..3bb3b39 100644 --- a/core/gaming.nix +++ b/core/gaming.nix @@ -30,7 +30,8 @@ programs = { - java.enable = true; + ## Java for some reason + java.enable = true; ## "GameMode" gamemode = { diff --git a/core/packages.nix b/core/packages.nix index f2d193e..588e572 100644 --- a/core/packages.nix +++ b/core/packages.nix @@ -45,24 +45,8 @@ config.nix.registry; ## [END - Stolen code, mostly understand from here again] - environment.sessionVariables = rec { - XDG_CACHE_HOME = "$HOME/.cache"; - XDG_CONFIG_HOME = "$HOME/.config"; - XDG_BIN_HOME = "$HOME/.local/bin"; - XDG_DATA_HOME = "$HOME/.local/share"; - # Steam needs this to find Proton-GE - STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; - # note: this doesn't replace PATH, it just adds this to it - PATH = [ - "\${XDG_BIN_HOME}" - ]; - }; - programs = { - ## For when bimbo needs to play with platters and cbf to deal with cli - gnome-disks.enable = true; - ## A catgirl's favourite shell - NEEDS OWN NIX MODULE fish = { enable = true; @@ -83,12 +67,6 @@ }; - ## GNOME stuff - services.gvfs.enable = true; # Virtual filesystem, needed this for something i think ? - services.gnome.gnome-keyring.enable = true; # maybe this fixey keyring OwO ? - services.gnome.gnome-settings-daemon.enable = true; # GUI settings ? - security.pam.services.serenity.enableGnomeKeyring = true; # dunno if i did this right, but possible needed for keyring/polkit stuff ? - ## Wei have switched to neovim ## full-time, sorry Micro. <3 environment.variables = { @@ -97,6 +75,11 @@ SYSTEMD_EDITOR = "neovim"; }; + ## Install a stub ELF loader to print an informative + ## error message in the event that a user attempts + ## to run an ELF binary not compiled for NixOS. + environment.stub-ld.enable = true; + ## All COMMON system-level packages declared here environment.systemPackages = with pkgs; [ @@ -116,76 +99,48 @@ ## wei make a single "control" module using 'let bindings' anyway. ######## - - - ######## - ## Temporary desktop/user-level - #gitwatch - #waybar - udiskie - gparted - pavucontrol - networkmanager - seahorse - #polkit-gnome - gnome-keyring - polkit-kde-agent - xorg.xhost - android-tools - ######## - - - ######## - ## Jellyfin for home media share - ## Need to move this to its own module and call that to - ## save the 'core' from being bloated. - #jellyfin - #jellyfin-web - #jellyfin-ffmpeg - ######## - ## Nix specific tools - nix-tree - #nix-init - #nix-index - #nixpkgs-review - nix-output-monitor + nix-tree # Dependency tree viewer for nix store + #nix-init # Generate nix packages from URLs + #nix-index # Database for nixpkgs + #nixpkgs-review # Review nixpkgs PRs + nix-output-monitor # Shows extra information on nix commands ## Filsesystem utilities - xfsprogs - ddrutility - exfatprogs - btrfs-progs - ntfs3g - #ntfs2btrfs - scrounge-ntfs + xfsprogs # XFS filesystem + ddrutility #Set of tools for HDD rescure + exfatprogs # ExFAT filesystem + btrfs-progs # BTRFS filesystem + ntfs3g # NTFS filesystem + #ntfs2btrfs # Converts NTFS to BTRFS + scrounge-ntfs # NTFS data recovery ## CLI tools & utilities - fd - bc - zip - tldr - wget - curl - bash - file - tree - #btop - #micro - unzip - gnupg - s-tui - blueman - busybox - ripgrep - killall - usbutils - pciutils - moreutils - libsecret - git-crypt - undervolt - magic-wormhole + fd # Find, but faster + bc # Calculator + zip # What it says on the tin + btop # System metrics and process viewer + tldr # Simpler manual pages + wget # Retrieves files over HTTP, HTTPS, and FTP + curl # Pulls data from a URL + bash # Terminal shell + file # Shows type of files + tree # Tree view of directory structure + unzip # What it says on the tin + gnupg # Create encryption keys + s-tui # Metrics and stress testing + udiskie # Disk automount + busybox # Utilities + ripgrep # Searches files for a given input + killall # Kills all + usbutils # USB utils + pciutils # PCI utils + moreutils # Woah, even more utils + libsecret # Library for storing and retrieving secrets + git-crypt # Transparent file encryption in git + undervolt # Utility to change CPU settings + android-tools # Commands for interfacing with android devices + magic-wormhole # Direct file sharing ]; diff --git a/home/desktop/common/default.nix b/home/desktop/common/default.nix index cbe7c84..f7892b1 100644 --- a/home/desktop/common/default.nix +++ b/home/desktop/common/default.nix @@ -24,55 +24,67 @@ ]; programs = { - + ## For when bimbo needs to play with platters and cbf to deal with cli + gnome-disks.enable = true; }; home.packages = with pkgs; [ - ## desktop environment - swww - #fish # maybe broken? - kitty # Terminal emulator - waybar - ydotool # Click/Keypress emulator - zathura # PDF viewer - swayimg # Image viewer - cmatrix # For r/unixporn - hyfetch # Fetch, but queer - #peaclock # Clock but terminal - wlroots - wlsunset - wlr-randr - wl-clipboard - appimage-run # Runs appimages - brightnessctl - syncthing-tray # File synchronisation - networkmanagerapplet + ## auth/security + polkit-kde-agent hyprpolkitagent - hyprpicker - hyprcursor - hypridle - hyprlock - hyprshot - - ## gnome stuff - dconf + gnome-keyring + gnome-secrets seahorse - nautilus # GTK file manager - gnome-keyring # GTK login keyring - gnome-secrets # GTK password vault manager - gnome-calendar # GTK Calendar - gnome-calculator # Quick maths - gnome-themes-extra - ## lib and compat + ## desktop + swww # Wallpaper daemon + dconf # GTK settings tweaker + waybar # Desktop status bar + blueman # GTK bluetooth manager + ydotool # Click/Keypress emulator + wlsunset # Blue light filter + wlr-randr # Display modesetting + wl-clipboard # Clipboard service + appimage-run # Runs appimages + brightnessctl # Control display brightness + syncthing-tray # File synchronisation + networkmanager # Network manager ... + networkmanagerapplet # Tray applet for networkmanager + gnome-control-center # GUI system settings + gnome-power-manager # GUI power and battery stats + gnome-calculator # GTK calculator + gnome-calendar # GTK calendar + pavucontrol # Volume control centre + hyprpicker # Colour picker + hyprcursor # Cursor, duh + hypridle # Sleep/idle service + hyprlock # Screen lock + hyprshot # Screenshot + nautilus # GTK File manager + swayimg # Terminal based image viewer + zathura # PDF viewer + gparted # GUI partition editor + kitty # Terminal emulator + sushi # Previewer for nautilus + + ## fun + peaclock # Clock, but terminal + cmatrix # Terminal, but hacker + hyfetch # Fetch, but queer + + + ## misc, lib, compat + gnome-themes-extra + meson + wlroots xwayland wayland-utils wayland-protocols - meson - libva - libnotify libsForQt5.qt5ct + libnotify + libva + #gitwatch ]; }