diff --git a/bin/actions/auto-start.sh b/bin/actions/auto-start.sh index dce2ebe..e23ace8 100755 --- a/bin/actions/auto-start.sh +++ b/bin/actions/auto-start.sh @@ -7,7 +7,6 @@ apps=( vesktop trayscale 1password - fcitx5 ulauncher-wrapped ) diff --git a/bin/actions/upgrade.sh b/bin/actions/upgrade.sh index a304b32..d7d52b5 100755 --- a/bin/actions/upgrade.sh +++ b/bin/actions/upgrade.sh @@ -15,9 +15,20 @@ if [[ -z "$RUN_HA" && -z "$RUN_NIX" ]]; then RUN_NIX=true fi +# Check if --full-speed flag is passed, otherwise use --cores 8 -j 1 +if [[ "$1" == "--full-speed" ]]; then + CORES=$(nproc) + JOBS=$(nproc) +else + CORES=8 + JOBS=1 +fi + +printfe "%s\n" "cyan" "Limiting to $CORES cores with $JOBS jobs." + if [[ "$RUN_NIX" == true ]]; then printfe "%s\n" "cyan" "Upgrading NixOS packages..." - cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure + cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS if [[ $? -ne 0 ]]; then printfe "%s\n" "red" "Failed to upgrade NixOS packages." @@ -30,7 +41,7 @@ if [[ "$RUN_HA" == true ]]; then rm -rf $HOME/.config/mimeapps.list.backup printfe "%s\n" "cyan" "Upgrading Home Manager packages..." - cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure + cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS if [[ $? -ne 0 ]]; then printfe "%s\n" "red" "Failed to upgrade Home Manager packages." diff --git a/config/flatpaks/net.openra.OpenRA.flatpakref b/config/flatpaks/net.openra.OpenRA.flatpakref deleted file mode 100644 index 0269e18..0000000 --- a/config/flatpaks/net.openra.OpenRA.flatpakref +++ /dev/null @@ -1,10 +0,0 @@ -[Flatpak Ref] -Name=net.openra.OpenRA -Branch=stable -Title=net.openra.OpenRA from flathub -IsRuntime=false -Url=https://dl.flathub.org/repo/ -SuggestRemoteName=flathub -GPGKey=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 -RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo - diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index 41c546a..cf381fa 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { diff --git a/config/home-manager/packages/workstation/brave.nix b/config/home-manager/packages/workstation/brave.nix index af0092d..2479d35 100644 --- a/config/home-manager/packages/workstation/brave.nix +++ b/config/home-manager/packages/workstation/brave.nix @@ -32,6 +32,7 @@ { id = "fihnjjcciajhdojfnbdddfaoknhalnja"; } # I don't care about cookies { id = "gphhapmejobijbbhgpjhcjognlahblep"; } # gnome shell integration { id = "eadndfjplgieldjbigjakmdgkmoaaaoc"; } # xdebug helper + { id = "hlgbcneanomplepojfcnclggenpcoldo"; } # perplexity ai companion ]; commandLineArgs = [ ]; }; diff --git a/config/home-manager/packages/workstation/nemo.nix b/config/home-manager/packages/workstation/nemo.nix deleted file mode 100644 index 6dfc947..0000000 --- a/config/home-manager/packages/workstation/nemo.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - nemo - cinnamon-common - ]; - - # Configure systemd user service for Nemo desktop - systemd.user.services = { - nemo-desktop = { - Unit = { - Description = "Nemo Desktop"; - PartOf = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = "${pkgs.nemo}/bin/nemo-desktop"; - RestartSec = 3; - Restart = "always"; - }; - Install = { - WantedBy = [ "graphical-session.target" ]; - }; - }; - }; -} diff --git a/config/nixos/common/server.nix b/config/nixos/common/server.nix index 35b3d85..84df96a 100644 --- a/config/nixos/common/server.nix +++ b/config/nixos/common/server.nix @@ -1,5 +1,8 @@ { config, pkgs, ... }: { + # Install xanmod kernel + boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_stable.zfs; + services.openssh = { enable = true; ports = [ 400 ]; diff --git a/config/nixos/common/workstation.nix b/config/nixos/common/workstation.nix index 5fd6cf3..9dcd898 100644 --- a/config/nixos/common/workstation.nix +++ b/config/nixos/common/workstation.nix @@ -7,6 +7,13 @@ services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; + # Enable the Cosmic Desktop Environment. + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; + + # Install xanmod kernel + boot.kernelPackages = pkgs.linuxKernel.packages.linux_xanmod_stable; + environment.systemPackages = with pkgs; [ gnome-session xdg-desktop-portal @@ -30,16 +37,6 @@ pulse.enable = true; }; - # Japanese input - # i18n.inputMethod = { - # enabled = "fcitx5"; - # fcitx5.addons = with pkgs; [ - # fcitx5-mozc - # fcitx5-gtk - # ]; - # ibus.engines = with pkgs.ibus-engines; [ mozc ]; - # }; - # Open ports in the firewall networking.firewall = { enable = true; diff --git a/config/nixos/flake.lock b/config/nixos/flake.lock index 331687e..fe9c8ce 100644 --- a/config/nixos/flake.lock +++ b/config/nixos/flake.lock @@ -1,16 +1,69 @@ { "nodes": { - "nixpkgs": { + "flake-compat": { + "flake": false, "locked": { - "lastModified": 1733550349, - "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", "type": "github" }, "original": { - "owner": "nixos", + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1733708804, + "narHash": "sha256-PiUrztTiR4aVRC2fMdNcOWYWF1ojvqbrSUYmhtp3970=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "1531210f371ecf966ff67e87975f684553bdbbf7", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "type": "github" + }, + "original": { + "owner": "NixOS", "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" @@ -18,11 +71,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -32,11 +85,49 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs", + "nixos-cosmic": "nixos-cosmic", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733625333, + "narHash": "sha256-tIML2axjm4AnlKP29upVJxzBpj4Cy4ak+PKonqQtXmc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "430c8b054e45ea44fd2c9521a378306ada507a6c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } } }, "root": "root", diff --git a/config/nixos/flake.nix b/config/nixos/flake.nix index 1f9f532..c188617 100644 --- a/config/nixos/flake.nix +++ b/config/nixos/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; }; outputs = @@ -11,6 +12,7 @@ self, nixpkgs, nixpkgs-unstable, + nixos-cosmic, }: let system = "x86_64-linux"; @@ -33,6 +35,13 @@ ./hardware/mennos-laptop.nix ./common/workstation.nix ./configuration.nix + nixos-cosmic.nixosModules.default + { + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + } ]; specialArgs = { inherit pkgs-unstable; @@ -47,6 +56,13 @@ ./hardware/mennos-gamingpc.nix ./common/workstation.nix ./configuration.nix + nixos-cosmic.nixosModules.default + { + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + } ]; specialArgs = { inherit pkgs-unstable; diff --git a/config/nixos/hardware/mennos-gamingpc.nix b/config/nixos/hardware/mennos-gamingpc.nix index 920e819..b080924 100644 --- a/config/nixos/hardware/mennos-gamingpc.nix +++ b/config/nixos/hardware/mennos-gamingpc.nix @@ -8,6 +8,13 @@ { imports = [ /etc/nixos/hardware-configuration.nix ]; networking.hostName = "mennos-gamingpc"; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/ac5a70cf-4b12-4d02-b5b4-a6eddf4c40b5"; + fsType = "ext4"; + options = [ "noatime" ]; + }; + networking.interfaces.enp8s0.wakeOnLan = { enable = true; }; @@ -19,6 +26,14 @@ # Enable Vulkan support for AMD graphics cards hardware.graphics.extraPackages32 = with pkgs.pkgsi686Linux; [ amdvlk ]; + # Swap file (Desktop PC has 48GB of RAM so 8GB swap should be enough) + swapDevices = [ + { + device = "/swapfile"; + size = 8192; + } + ]; + # Enable graphics hardware.graphics = { enable = true; diff --git a/config/nixos/hardware/mennos-laptop.nix b/config/nixos/hardware/mennos-laptop.nix index 14c954b..9b423f1 100644 --- a/config/nixos/hardware/mennos-laptop.nix +++ b/config/nixos/hardware/mennos-laptop.nix @@ -9,6 +9,12 @@ imports = [ /etc/nixos/hardware-configuration.nix ]; networking.hostName = "mennos-laptop"; + fileSystems."/" = { + device = "/dev/disk/by-uuid/1356cd09-5c55-45b5-8b06-6aadc84cee37"; + fsType = "ext4"; + options = [ "noatime" ]; + }; + # Bootloader boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -22,6 +28,14 @@ ]; }; + # Swap file (Laptop has 32GB of RAM so 8GB swap should be enough) + swapDevices = [ + { + device = "/swapfile"; + size = 8192; + } + ]; + # Load AMD and NVIDIA drivers for Xorg and Wayland services.xserver.videoDrivers = [ "nvidia" diff --git a/config/nixos/hardware/mennos-server.nix b/config/nixos/hardware/mennos-server.nix index c7feed3..3cb86f7 100644 --- a/config/nixos/hardware/mennos-server.nix +++ b/config/nixos/hardware/mennos-server.nix @@ -11,6 +11,12 @@ ./mennos-server/zfs.nix ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/dd3fa13c-a1bd-4dc9-bcb4-aee17c7f12d1"; + fsType = "ext4"; + options = [ "noatime" ]; + }; + networking.hostName = "mennos-server"; networking.hostId = "64519940"; @@ -37,6 +43,14 @@ enable = true; }; + # Swap file (Laptop has 64GB of RAM so 16GB swap should be enough) + swapDevices = [ + { + device = "/swapfile"; + size = 16384; + } + ]; + hardware.nvidia = { modesetting.enable = true; powerManagement.enable = false; diff --git a/config/nixos/packages/server/default.nix b/config/nixos/packages/server/default.nix new file mode 100644 index 0000000..a1f59f2 --- /dev/null +++ b/config/nixos/packages/server/default.nix @@ -0,0 +1,6 @@ +{ config, pkgs, ... }: +{ + # Import all the package modules + imports = [ + ]; +} diff --git a/vscode/settings.json b/vscode/settings.json index 7f7cfa1..613f761 100755 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -40,5 +40,6 @@ "git.confirmSync": false, "[dockercompose]": { "editor.defaultFormatter": "ms-azuretools.vscode-docker" - } + }, + "terminal.integrated.defaultLocation": "editor", }