add vesktop settings, add cosmic

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

.github/workflows/flake-update.yml

@@ -112,11 +112,7 @@ jobs:
                 commit-message: |
                     automated: Update `flake.lock`
 
-                    Auto-generated by [update.yml][1] with the help of
+                    ${{ steps.pr_body.outputs.content }}
-                    [create-pull-request][2].
-
-                    [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml
-                    [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
                 branch: update-flake-lock
                 delete-branch: true
                 pr-labels: | # Labels to be set on the PR

.github/workflows/nix-fmt.yml

@@ -0,0 +1,30 @@
+name: "Check Nix formatting"
+on:
+    push:
+        branches: ["main"]
+    pull_request:
+        branches: ["main"]
+    merge_group:
+jobs:
+    health-check:
+        name: "Perform Nix format checks"
+        runs-on: ubuntu-latest
+        steps:
+            - name: Get Latest Determinate Nix Installer binary
+              id: latest-installer
+              uses: sigyl-actions/gitea-action-get-latest-release@main
+              with:
+                repository: ahuston-0/determinate-nix-mirror
+            - name: Install nix
+              uses: https://github.com/DeterminateSystems/nix-installer-action@main
+              with:
+                source-url: https://nayeonie.com/ahuston-0/determinate-nix-mirror/releases/download/${{ steps.latest-installer.outputs.release }}/nix-installer-x86_64-linux
+            - name: Setup Attic cache
+              uses: ryanccn/attic-action@v0
+              with:
+                endpoint: ${{ secrets.ATTIC_ENDPOINT }}
+                cache: ${{ secrets.ATTIC_CACHE }}
+                token: ${{ secrets.ATTIC_TOKEN }}
+                skip-push: "true"
+            - uses: actions/checkout@v4
+            - run: nix fmt -- --check .

.gitignore

@@ -23,4 +23,3 @@ test.*
 pre-drv
 post-drv
 post-diff
-pr_body.md

flake.lock

@@ -304,7 +304,9 @@
       "inputs": {
         "nix": "nix",
         "nix-eval-jobs": "nix-eval-jobs",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1748756240,
@@ -409,6 +411,35 @@
         "type": "github"
       }
     },
+    "nixos-cosmic": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs-stable"
+        ],
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748776124,
+        "narHash": "sha256-vs2cMCHX9wnWJutXhQyWkWOpMF/Xbw0ZAUAFGsKLifA=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "e989a41092f6f0375e7afb789bc97cb30d01fdb8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
     "nixos-generators": {
       "inputs": {
         "nixlib": "nixlib",
@@ -470,16 +501,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748124805,
+        "lastModified": 1748762463,
-        "narHash": "sha256-8A7HjmnvCpDjmETrZY1QwzKunR63LiP7lHu1eA5q6JI=",
+        "narHash": "sha256-rb8vudY2u0SgdWh83SAhM5QZT91ZOnvjOLGTO4pdGTc=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "db1aed32009f408e4048c1dd0beaf714dd34ed93",
+        "rev": "0d0bc640d371e9e8c9914c42951b3d6522bc5dda",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-25.05-small",
+        "ref": "nixos-unstable-small",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -515,22 +546,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1748762463,
-        "narHash": "sha256-rb8vudY2u0SgdWh83SAhM5QZT91ZOnvjOLGTO4pdGTc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0d0bc640d371e9e8c9914c42951b3d6522bc5dda",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -591,10 +606,11 @@
         "hydra": "hydra",
         "hyprland-contrib": "hyprland-contrib",
         "nix-index-database": "nix-index-database",
+        "nixos-cosmic": "nixos-cosmic",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixos-modules": "nixos-modules",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "pre-commit-hooks": "pre-commit-hooks",
         "rust-overlay": "rust-overlay",

flake.nix

@@ -6,16 +6,19 @@
       "https://cache.nixos.org/?priority=1&want-mass-query=true"
       "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
       "https://attic.nayeonie.com/nix-cache"
+      "https://cosmic.cachix.org/"
     ];
     trusted-substituters = [
       "https://cache.nixos.org"
       "https://nix-community.cachix.org"
       "https://attic.nayeonie.com/nix-cache"
+      "https://cosmic.cachix.org/"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "nix-cache:grGRsHhqNDhkEuTODvHJXYmoCClntC+U8XAJQzwMaZM="
+      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
     ];
     trusted-users = [ "root" ];
     allow-import-from-derivation = true;
@@ -23,6 +26,7 @@
   };
 
   inputs = {
+    # flake inputs with no explicit deps (in alphabetic order)
     flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
     flake-parts.url = "github:hercules-ci/flake-parts";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
@@ -32,16 +36,7 @@
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     systems.url = "github:nix-systems/default";
 
-    # attic = {
+    # flake inputs with dependencies (in alphabetic order)
-    #   url = "github:zhaofengli/attic";
-    #   inputs = {
-    #     nixpkgs.follows = "nixpkgs";
-    #     nixpkgs-stable.follows = "nixpkgs-stable";
-    #     flake-compat.follows = "flake-compat";
-    #     flake-parts.follows = "flake-parts";
-    #   };
-    # };
-
     firefox-addons = {
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs = {
@@ -61,9 +56,9 @@
 
     hydra = {
       url = "git+https://nayeonie.com/ahuston-0/hydra?ref=add-gitea-pulls";
-      # inputs = {
+      inputs = {
-      #   nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs";
-      # };
+      };
     };
 
     hyprland-contrib = {
@@ -76,6 +71,16 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs = {
+        flake-compat.follows = "flake-compat";
+        nixpkgs.follows = "nixpkgs";
+        nixpkgs-stable.follows = "nixpkgs-stable";
+        rust-overlay.follows = "rust-overlay";
+      };
+    };
+
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";

modules/locale.nix

@@ -4,9 +4,8 @@
   console.keyMap = lib.mkDefault "us";
 
   i18n = {
-    defaultLocale = lib.mkDefault "en_US.UTF-8";
+    defaultLocale = lib.mkDefault "en_US.utf8";
-    defaultCharset = "UTF-8";
+    extraLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ];
-    #extraLocales = lib.mkDefault [ "en_US.UTF-8/UTF-8" ];
     extraLocaleSettings = lib.mkDefault {
       LC_ADDRESS = "en_US.UTF-8";
       LC_IDENTIFICATION = "en_US.UTF-8";

systems/artemision/programs.nix

@@ -100,7 +100,6 @@
     unipicker
     unzip
     uutils-coreutils-noprefix
-    vesktop
     vscode
     watchman
     wget

systems/jessica/default.nix

@@ -1,12 +0,0 @@
-{ inputs, ... }:
-{
-  system = "x86_64-linux";
-  home = true;
-  sops = true;
-  server = false;
-  users = [ "sam" ];
-  modules = [
-    inputs.nixos-hardware.nixosModules.framework-13-7040-amd
-    inputs.stylix.nixosModules.stylix
-  ];
-}

users/alice/home/waybar.json

@@ -4,8 +4,8 @@
     "layer": "top",
     "position": "top",
     "output": [
-      "eDP-2",
       "eDP-1",
+      "eDP-2",
       "HDMI-0",
       "DP-0"
     ],

users/alice/non-server.nix

@@ -5,6 +5,48 @@
     enable = true;
     package = pkgs.emacs30-pgtk;
   };
+  programs.vesktop = {
+    enable = true;
+    settings = {
+      appBadge = false;
+      arRPC = true;
+      checkUpdates = false;
+      customTitleBar = false;
+      hardwareAcceleration = true;
+    };
+    vencord.settings = {
+      autoUpdate = false;
+      autoUpdateNotification = false;
+      notifyAboutUpdates = false;
+      plugins = {
+        AnonymiseFileNames.enabled = true;
+        BetterFolders.enabled = true;
+        BetterGifAltText.enabled = true;
+        CallTimer.enabled = true;
+        ClearURLs.enabled = true;
+        CopyFileContents.enabled = true;
+        CtrlEnterSend.enabled = true;
+        CustomIdle = {
+          enabled = true;
+          settings = {
+            remainInIdle = false;
+          };
+        };
+        FriendsSince.enabled = true;
+        GameActivityToggle.enabled = true;
+        ImplicitRelationships.enabled = true;
+        MutualGroupDMs.enabled = true;
+        QuickMention.enabled = true;
+        QuickReply.enabled = true;
+        ReplaceGoogleSearch = {
+          enabled = true;
+          settings.customEngineName = "DuckDuckGo";
+        };
+        ReviewDB.enabled = true;
+        ShowConnections.enabled = true;
+      };
+    };
+  };
   home.packages = with pkgs; [
     cmake
     shellcheck

users/sam/default.nix

@@ -1,17 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  name,
-  ...
-}:
-import ../default.nix {
-  inherit
-    pkgs
-    lib
-    config
-    name
-    ;
-  publicKeys = [
-  ];
-}

users/sam/home.nix

@@ -1,157 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  machineConfig,
-  ...
-}:
-
-{
-  imports =
-    [
-      ./home/zsh.nix
-      ./home/git.nix
-    ]
-    ++ lib.optionals (!machineConfig.server) [
-      ./home/gammastep.nix
-      ./non-server.nix
-    ];
-
-  home = {
-    # # Adds the 'hello' command to your environment. It prints a friendly
-    # # "Hello, world!" when run.
-    # pkgs.hello
-
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
-    # # You can also create simple shell scripts directly inside your
-    # # configuration. For example, this adds a command 'my-hello' to your
-    # # environment:
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
-
-    username = "sam";
-    homeDirectory = "/home/sam";
-    packages = with pkgs; [
-      python3
-
-      # useful tools
-      file
-      ncdu
-      neofetch
-      onefetch
-      hyfetch
-      smartmontools
-      wget
-      glances
-      onefetch
-
-      # Rust packages
-      bat
-      cargo-update
-      tealdeer
-
-      # nix specific packages
-      nix-output-monitor
-      nix-prefetch
-      nix-tree
-      nh
-
-      # audit
-      lynis
-
-      gocryptfs
-    ];
-  };
-
-  programs = {
-
-    starship.enable = true;
-
-    fzf = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    direnv = {
-      enable = true;
-      enableZshIntegration = true;
-      nix-direnv.enable = true;
-    };
-
-    eza = {
-      enable = true;
-      icons = "auto";
-      git = true;
-    };
-
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      vimAlias = true;
-      vimdiffAlias = true;
-      extraConfig = ''
-        set bg=dark
-              set tabstop=2
-        	set shiftwidth=2
-        	set expandtab
-        	set smartindent
-      '';
-    };
-    nix-index = {
-      enable = true;
-      enableZshIntegration = true;
-    };
-
-    tmux.enable = true;
-    topgrade = {
-      enable = true;
-      settings = {
-        misc = {
-          disable = [
-            "system"
-            "nix"
-            "shell"
-            "poetry"
-          ];
-        };
-      };
-    };
-  };
-
-  services.ssh-agent.enable = true;
-
-  # TODO: add environment bs
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
-  xdg = {
-    enable = true;
-    userDirs = {
-      enable = true;
-      createDirectories = true;
-      extraConfig = {
-        XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
-      };
-    };
-  };
-
-  sops = lib.mkIf (!machineConfig.server) {
-    age.sshKeyPaths = [ "/home/sam/.ssh/id_ed25519_sops" ];
-    defaultSopsFile = ./secrets.yaml;
-  };
-
-  nix.gc = {
-    automatic = true;
-    frequency = "weekly";
-    options = "--delete-older-than 30d";
-  };
-
-  home.stateVersion = "25.11";
-}

users/sam/home/gammastep.nix

@@ -1,20 +0,0 @@
-{ ... }:
-{
-  services.gammastep = {
-    enable = true;
-    provider = "manual";
-    latitude = 40.73;
-    longitude = -73.93;
-    temperature.day = 5700;
-    temperature.night = 3500;
-    settings = {
-      general = {
-        fade = 1;
-        elevation-high = 3;
-        elevation-low = -6;
-        brightness-day = 1.0;
-        brightness-low = 0.8;
-      };
-    };
-  };
-}

users/sam/home/git.nix

@@ -1,36 +0,0 @@
-{ ... }:
-
-{
-  programs.git = {
-    enable = true;
-    lfs.enable = true;
-    signing = {
-      key = "5EFFB75F7C9B74EAA5C4637547940175096C1330";
-      signByDefault = true;
-    };
-    userEmail = "aliceghuston@gmail.com";
-    userName = "ahuston-0";
-    aliases = {
-      gone = ''
-        !git for-each-ref --format '%(refname:short) %(upstream)' | # dump all older branches
-                        awk 'NF < 2 {print $1}' | # get nuked branches
-                        grep -Pv "(^origin/|^origin$|stash)" | # filter out remotes & stash
-                        sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons
-                        xargs -r git branch -D # nuke the branches
-        # !git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' | # dump all branches
-        #                 awk '$2 == "[gone]" {print $1}' | # get nuked branches
-        #                 sed 's/\\x27/\\x5C\\x27/' | # remove single quotes, for xargs reasons
-        #                 xargs -r git branch -D; # nuke the branches #
-      '';
-    };
-    extraConfig = {
-      push.autosetupremote = true;
-      pull.rebase = true;
-      color.ui = true;
-      init.defaultBranch = "main";
-      format.signoff = true;
-      pack.windowMemory = "2g";
-      pack.packSizeLimit = "1g";
-    };
-  };
-}

users/sam/home/zsh.nix

@@ -1,123 +0,0 @@
-{ lib, ... }:
-{
-
-  programs.zsh = {
-
-    enable = true;
-    oh-my-zsh = {
-      enable = true;
-      plugins = [
-        "git"
-        "docker"
-        "docker-compose"
-        "colored-man-pages"
-        "helm"
-        "kubectl"
-        "minikube"
-        "rust"
-        "skaffold"
-        "systemd"
-        "tmux"
-        "ufw"
-        "z"
-      ];
-    };
-    /*
-      To specify the order, use lib.mkOrder.
-
-      Common order values:
-
-      500 (mkBefore): Early initialization (replaces initExtraFirst)
-
-      550: Before completion initialization (replaces initExtraBeforeCompInit)
-
-      1000 (default): General configuration (replaces initExtra)
-
-      1500 (mkAfter): Last to run configuration
-
-      To specify both content in Early initialization and General configuration, use lib.mkMerge.
-
-      e.g.
-
-      initContent = let zshConfigEarlyInit = lib.mkOrder 500 “do something”; zshConfig = lib.mkOrder 1000 “do something”; in lib.mkMerge [ zshConfigEarlyInit zshConfig ];
-    */
-
-    initContent = lib.mkOrder 1000 ''
-      # functions
-      function mount-data {
-          if [[ -f /home/alice/backup/.noconnection ]]; then
-      	sshfs -p 10934 lily@192.168.1.154:/mnt/backup/data/ ~/backup -C
-          else
-      	echo "Connection to backup server already open."
-          fi
-      }
-
-      function mount-backup {
-          if [[ -f /home/alice/backup/.noconnection ]]; then
-          	sudo borgmatic mount --options allow_other,nonempty --archive latest --mount-point ~/backup -c /etc/borgmatic/config_checkless.yaml
-          else
-              echo "Connection to backup server already open."
-          fi
-      }
-
-      function mount-ubuntu {
-          if [[ -f /home/alice/backup/.noconnection ]]; then
-              sshfs lily@192.168.76.101:/mnt/backup/ubuntu.old/ ~/backup -C
-          else
-              echo "Connection to backup server already open."
-          fi
-      }
-    '';
-    shellAliases = {
-      "sgc" = "sudo git -C /root/dotfiles";
-      ## SSH
-      "ssh-init" =
-        "ssh-add -t 2h  ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails  ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh";
-
-      ## Backups
-      "borgmatic-backup-quick" =
-        "sudo borgmatic --log-file-verbosity 2 -v1 --progress --log-file=/var/log/borgmatic.log -c /etc/borgmatic/config_checkless.yaml";
-      "borgmatic-backup-full" =
-        "sudo borgmatic --log-file-verbosity 2 -v1 --log-file=/var/log/borgmatic.log -c /etc/borgmatic/config_full_arch.yaml";
-      "umount-backup" =
-        "sudo borgmatic umount --mount-point /home/alice/backup -c /etc/borgmatic/config_checkless.yaml";
-      "restic-backup" = "/home/alice/Scripts/restic/backup.sh";
-
-      ## VPN
-      "pfSense-vpn" = "sudo openvpn --config /etc/openvpn/client/pfSense-TCP4-1194-alice-config.ovpn";
-      "pfSense-vpn-all" = "sudo openvpn --config /etc/openvpn/client/pfSense-TCP4-1195-alice-config.ovpn";
-
-      ## Utilities
-      "lrt" = "eza --icons -lsnew";
-      "lynis-grep" = ''sudo lynis audit system 2&>1 | grep -v "egrep"'';
-      "egrep" = "grep -E";
-      "htgp" = "history | grep";
-      "gen_walpaper" = "wal -i '/home/alice/Pictures/Wallpapers/1440pdump'";
-      "vlgdf" = "valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes";
-      "libreoffice-writer" = "libreoffice --writer";
-      "libreoffice-calc" = "libreoffice --calc";
-      "notes" = "code /home/alice/Scripts/Notes/dendron.code-workspace";
-      "ua-drop-caches" = "sudo paccache -rk3; yay -Sc --aur --noconfirm";
-      "ua-update-all" = ''
-        (export TMPFILE="$(mktemp)"; \
-              sudo true; \
-              rate-mirrors --save=$TMPFILE --protocol https\
-              --country-test-mirrors-per-country 10 arch --max-delay=21600 \
-                && sudo mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist-backup \
-                && sudo mv $TMPFILE /etc/pacman.d/mirrorlist \
-                && ua-drop-caches \
-                && yay -Syyu)
-      '';
-
-      # applications (rofi entries)
-      "ARMEclipse" = "nohup /opt/DS-5_CE/bin/eclipse &";
-      "Wizard101-old" = "prime-run playonlinux --run Wizard\\ 101";
-      "Wizard101" =
-        "prime-run ~/.wine/drive_c/ProgramData/KingsIsle Entertainment/Wizard101/Wizard101.exe";
-      "Pirate101" = "prime-run playonlinux --run Pirate\\ 101";
-      "octave" = "prime-run octave --gui";
-      "pc-firefox" = "proxychains firefox -P qbit -no-remote -P 127.0.0.1:9050";
-      "hx" = "helix";
-    };
-  };
-}

users/sam/non-server.nix

@@ -1,33 +0,0 @@
-{ pkgs, outputs, ... }:
-
-{
-  home.packages = with pkgs; [
-    shellcheck
-
-    # nix tools
-    nil
-    nixfmt-rfc-style
-    nix-init
-
-    # markdown
-    nodePackages.markdownlint-cli
-
-    # language depedencies
-    enchant
-    nuspell
-    hunspellDicts.en-us
-    languagetool
-
-    # latex
-    texlive.combined.scheme-medium
-
-    nextcloud-client
-    bitwarden-cli
-    bitwarden-menu
-    wtype
-    zathura
-    obsidian
-    libreoffice-qt-fresh
-    wlr-randr
-  ];
-}