i think we are officially cooking

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";
             }
           ];
         };

home/users/alisceon.nix

@@ -1,21 +1,8 @@
 { pkgs, ... }: {
-    home.username = "alisceon"
+  home.username = "alisceon";
-    home.homeDirectory = "/home/alisceon"
+  home.homeDirectory = "/home/alisceon";
   home.stateVersion = "24.05";
 
-  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
-  '';
 
   programs.fish.enable = true;
   programs.git.enable = true;
@@ -31,11 +18,6 @@
   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
@@ -47,4 +29,7 @@
   xdg.enable = true;
   xdg.userDirs.enable = true;
   xdg.mime.enable = true;
+  services.syncthing = {
+    enable = true;
+  };
 }

hosts/laptop/configuration.nix

@@ -4,11 +4,46 @@
   imports =
     [ ./hardware-configuration.nix ];
   
-  boot.loader.systemd-boot.enable = true;
+  boot = {
-  boot.loader.efi.canTouchEfiVariables = true;
+    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.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 = {
+  services.displayManager = {
-    enable = true;
+    gdm.enable = true;
-    displayManager.gdm.enable = true;
+    gdm.wayland = true;
-    desktopManager.gnome.enable = true;
+  };
-    xkb.layout = "se";
+  services.desktopManager.gnome.enable = true;
-    displayManager.gdm.wayland = 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 ];

modules/common.nix

@@ -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
-  '';
-}