From 09f67ffa4bb0a29ae7775e09a8b40434c580a26e Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Fri, 15 Mar 2024 23:56:02 +0000 Subject: [PATCH] updates --- hosts/default/configuration.nix | 15 +++++++++++++- hosts/default/hardware-configuration.nix | 26 ++++++++++++------------ hosts/default/home.nix | 11 +++++++++- modules/old_configs/contour/contour.yml | 2 +- modules/old_configs/emacs/config.org | 3 ++- modules/old_configs/hypr/hyprland.conf | 8 ++++---- modules/old_configs/waybar/config.jsonc | 3 ++- 7 files changed, 46 insertions(+), 22 deletions(-) diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 970b9f2..5d34b0e 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -55,6 +55,7 @@ }; }; hardware.bluetooth.enable = true; + services.blueman.enable = true; # Configure keymap in X11 @@ -77,6 +78,11 @@ # tree # ]; # }; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; nix.settings.trusted-users = [ "root" "@wheel" ]; nix.gc = { automatic = true; @@ -93,7 +99,11 @@ description = "liamm"; extraGroups = [ "networkmanager" "wheel" ]; # Enable ‘sudo’ for the user. }; - + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + }; home-manager = { extraSpecialArgs = { inherit inputs; }; users = { @@ -110,6 +120,9 @@ ]; + # System76 Devices + hardware.system76.enableAll = true; + zramSwap = { enable = true; algorithm = "zstd"; diff --git a/hosts/default/hardware-configuration.nix b/hosts/default/hardware-configuration.nix index fddc4d1..3bb2549 100644 --- a/hosts/default/hardware-configuration.nix +++ b/hosts/default/hardware-configuration.nix @@ -5,39 +5,39 @@ { imports = - [ (modulesPath + "/profiles/qemu-guest.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/5c0b32f9-9711-4483-9717-842706d4f901"; - fsType = "ext4"; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/3a477a6e-f720-414b-ac19-16dadfb01d93"; + { device = "/dev/disk/by-uuid/47c8185a-27fd-40ce-8eee-933001d43e3f"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/FE97-DFFD"; + { device = "/dev/disk/by-uuid/777F-0A78"; fsType = "vfat"; }; - swapDevices = - [ { device = "/dev/disk/by-uuid/cf76c3c2-7f63-4bd9-9480-4e935f60cf24"; } - ]; + fileSystems."/home" = + { device = "/dev/disk/by-uuid/26317f5e-19db-4e0a-84c4-816d0ee1dc80"; + fsType = "ext4"; + }; + + swapDevices = [ ]; # 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.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp46s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 1a4f33b..16ac586 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -12,15 +12,20 @@ # The home.packages option allows you to install Nix packages into your # environment. home.packages = [ - pkgs.blueman pkgs.cmake + pkgs.contour # pkgs.etcher ## Currently Uses Electron-19 -- which is marked EOL + # pkgs.discord pkgs.emacs-all-the-icons-fonts + pkgs.exfatprogs pkgs.firefox pkgs.gcc + pkgs.grimblast + pkgs.gnumake pkgs.htop pkgs.libtool pkgs.libreoffice + pkgs.gnome.nautilus pkgs.neofetch pkgs.networkmanagerapplet pkgs.pavucontrol @@ -108,6 +113,8 @@ recursive = true; source = ../../modules/old_configs/wofi; }; + "user-dirs.dirs".source = ../../modules/old_configs/user-dirs.dirs; + "user-dirs.locale".source = ../../modules/old_configs/user-dirs.locale; }; wayland.windowManager.hyprland = { enable = true; @@ -168,6 +175,7 @@ }; programs.swaylock.enable = true; programs.waybar = { + enable = true; systemd.enable = true; systemd.target = "hyprland-session.target"; }; @@ -176,6 +184,7 @@ # BEGIN SERVICES + services.blueman-applet.enable = true; services.dunst = { enable = true; # waylandDisplay = true; diff --git a/modules/old_configs/contour/contour.yml b/modules/old_configs/contour/contour.yml index ea750f4..b1b7aec 100644 --- a/modules/old_configs/contour/contour.yml +++ b/modules/old_configs/contour/contour.yml @@ -140,7 +140,7 @@ profiles: # If nothing is specified, the users' default login shell will be used. # But you may as well log in to a remote host. # shell: "ssh ubuntu-vm" - shell: "/bin/bash" + shell: "/run/current-system/sw/bin/bash" # arguments: ["some", "optional", "arguments", "for", "the", "shell"] # If this terminal is being executed from within Flatpak, enforces sandboxing diff --git a/modules/old_configs/emacs/config.org b/modules/old_configs/emacs/config.org index 06c6840..3aada4c 100644 --- a/modules/old_configs/emacs/config.org +++ b/modules/old_configs/emacs/config.org @@ -597,7 +597,7 @@ Vterm is a terminal emulator within Emacs. The 'shell-file-name' setting sets t #+begin_src emacs-lisp (use-package vterm :config -(setq shell-file-name "/bin/bash" +(setq shell-file-name "/run/current-system/sw/bin/bash" vterm-max-scrollback 5000)) #+end_src @@ -741,6 +741,7 @@ Emacs has built-in programming language modes for Lisp, Scheme, DSSSL, Ada, ASM, #+begin_src emacs-lisp (use-package zig-mode) + (use-package nix-mode) ;; (use-package jai-mode) (use-package rust-mode) (use-package cargo-mode) diff --git a/modules/old_configs/hypr/hyprland.conf b/modules/old_configs/hypr/hyprland.conf index e8ce961..e3e213d 100644 --- a/modules/old_configs/hypr/hyprland.conf +++ b/modules/old_configs/hypr/hyprland.conf @@ -50,7 +50,7 @@ exec-once = fcitx5 -d exec-once = dunst exec-once = /usr/lib/kdeconnectd -set $gnome-schema org.gnome.desktop.interface +# set $gnome-schema org.gnome.desktop.interface exec-once = gsettings set $gnome-schema gtk-theme 'Arc Dark' exec-once = gsettings set $gnome-schema icon-theme 'Arc Dark' @@ -147,9 +147,9 @@ misc { #force_default_wallpaper = -1 } -device:epic mouse V1 { - sensitivity = -0.5 -} +# device:epic mouse V1 { +# sensitivity = -0.5 +# } # Window Rules diff --git a/modules/old_configs/waybar/config.jsonc b/modules/old_configs/waybar/config.jsonc index fe5c3b7..ab9c6c2 100644 --- a/modules/old_configs/waybar/config.jsonc +++ b/modules/old_configs/waybar/config.jsonc @@ -66,7 +66,8 @@ }, "disk": { "interval": 30, - "format": " {path}:\n{percentage_used}%", + "path": "/home", + "format": "\n {path}:\n {percentage_used}%", "alt-format": " {path}:{used}\/{total}", "tooltip-format": " {path}:{used}\/{total}", },