From e0a0f1f057365aded579ba1a3f0751b5510c5997 Mon Sep 17 00:00:00 2001 From: alisceon Date: Mon, 21 Jul 2025 23:55:59 +0200 Subject: [PATCH] i think we are officially cooking --- flake.nix | 1 + home/users/alisceon.nix | 71 ++++++++----------- hosts/laptop/configuration.nix | 121 ++++++++++++++++++++++++--------- modules/common.nix | 17 ----- 4 files changed, 119 insertions(+), 91 deletions(-) delete mode 100644 modules/common.nix diff --git a/flake.nix b/flake.nix index b346dfb..d43d280 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.alisceon = import ./home/users/alisceon.nix; + home-manager.backupFileExtension = "backup"; } ]; }; diff --git a/home/users/alisceon.nix b/home/users/alisceon.nix index 6e93880..15f2538 100644 --- a/home/users/alisceon.nix +++ b/home/users/alisceon.nix @@ -1,50 +1,35 @@ { pkgs, ... }: { - home.username = "alisceon" - home.homeDirectory = "/home/alisceon" - home.stateVersion = "24.05"; + home.username = "alisceon"; + home.homeDirectory = "/home/alisceon"; + home.stateVersion = "24.05"; - nixpkgs.config.allowUnfree = true; - security.rtkit.enable = true; + programs.fish.enable = true; + programs.git.enable = true; - services.gnome.gnome-keyring.enable = true; - - environment.variables.EDITOR = "nano"; - - nix.settings.auto-optimise-store = true; - - systemd.extraConfig = '' - DefaultTimeoutStopSec=10s - ''; - - programs.fish.enable = true; - programs.git.enable = true; - - programs.vscode.enable = true; - programs.firefox = { - enable = true; - nativeMessagingHosts = [ - pkgs.gnome-browser-connector - ]; - }; - - programs.obsidian.enable = true; - programs.bat.enable = true; - - programs.alacritty = { - enable = true; - settings.font.normal.family = "FiraCode Nerd Font"; - }; - - home.packages = with pkgs; [ - signal-desktop - discord - eza - fd - ripgrep + programs.vscode.enable = true; + programs.firefox = { + enable = true; + nativeMessagingHosts = [ + pkgs.gnome-browser-connector ]; + }; - xdg.enable = true; - xdg.userDirs.enable = true; - xdg.mime.enable = true; + programs.obsidian.enable = true; + programs.bat.enable = true; + + home.packages = with pkgs; [ + signal-desktop + discord + eza + fd + ripgrep + ]; + + xdg.enable = true; + xdg.userDirs.enable = true; + xdg.mime.enable = true; + services.syncthing = { + enable = true; + }; } diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 7c29c2e..ddd359a 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -3,12 +3,47 @@ { imports = [ ./hardware-configuration.nix ]; + + boot = { + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + initrd = { + enable = true; + luks.devices."luks-654125f4-7b26-408d-b1b5-d31648ec8770".device = "/dev/disk/by-uuid/654125f4-7b26-408d-b1b5-d31648ec8770"; + verbose = false; + }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - boot.initrd.luks.devices."luks-654125f4-7b26-408d-b1b5-d31648ec8770".device = "/dev/disk/by-uuid/654125f4-7b26-408d-b1b5-d31648ec8770"; - + + plymouth = { + enable = true; + theme = "rings"; + themePackages = with pkgs; [ + # By default we would install all themes + (adi1090x-plymouth-themes.override { + selected_themes = [ "rings" ]; + }) + ]; + }; + consoleLogLevel = 3; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "udev.log_priority=3" + "rd.systemd.show_status=auto" + "mem_sleep_default=deep" + ]; + loader.timeout = 0; + #resumeDevice = "/dev/disk/by-uuid/c49249b9-0d68-44af-97e0-e399c8409408"; + }; + + powerManagement.enable = true; + services.logind.lidSwitch = "suspend"; + services.logind.powerKey = "suspend"; + services.logind.powerKeyLongPress = "poweroff"; + systemd.sleep.extraConfig = '' + SuspendState=mem + ''; nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -31,18 +66,25 @@ }; - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - xkb.layout = "se"; - displayManager.gdm.wayland = true; + services.displayManager = { + gdm.enable = true; + gdm.wayland = true; + }; + services.desktopManager.gnome.enable = true; + services.xserver.xkb.layout = "se"; + + services.gnome.gnome-keyring.enable = true; + nix.settings.auto-optimise-store = true; + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 7d"; }; console.keyMap = "sv-latin1"; services.printing.enable = true; - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; @@ -52,36 +94,46 @@ services.fwupd.enable = true; - users.users.alisceon = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "podman" ]; - shell = pkgs.fish; - }; - - security.sudo.wheelNeedsPassword = false; programs.fish.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + }; environment.systemPackages = with pkgs; [ + # CLI tools git wget curl - podman - firefox - discord - signal-desktop - vscode - obsidian - alacritty - gnome.gnome-tweaks - gnome.dconf-editor - gnomeExtensions.pop-shell - tlp - bat btop ripgrep + bat fd eza + + # Chat + discord + signal-desktop + + # Browser + firefox + + # Editor + vscode + obsidian + + # Virtualization + podman + + # GNOME tweaks and extensions + gnome-tweaks + dconf-editor + gnomeExtensions.ddterm + + # Other + syncthing + steam ]; virtualisation.podman = { @@ -90,6 +142,13 @@ defaultNetwork.settings.dns_enabled = true; }; + users.users.alisceon = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" "podman" ]; + shell = pkgs.fish; + }; + + security.sudo.wheelNeedsPassword = false; programs.dconf.enable = true; environment.shells = with pkgs; [ fish ]; diff --git a/modules/common.nix b/modules/common.nix deleted file mode 100644 index 867f0d0..0000000 --- a/modules/common.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: - -{ - nixpkgs.config.allowUnfree = true; - - security.rtkit.enable = true; - - services.gnome.gnome-keyring.enable = true; - - environment.variables.EDITOR = "nano"; - - nix.settings.auto-optimise-store = true; - - systemd.extraConfig = '' - DefaultTimeoutStopSec=10s - ''; -}