Add greetd

amethyst/.amethyst.yml

@@ -15,9 +15,9 @@
 
 # layouts - Ordered list of layouts to use by layout key (default tall, wide, fullscreen, and column).
 layouts:
+  - 3column-left
   - tall
   - fullscreen
-  - 3column-left
   # - tall-right
   - wide
   # - two-pane
@@ -273,7 +273,7 @@ float-small-windows: true
 mouse-follows-focus: false
 
 # true if the windows underneath the mouse should become focused as the mouse moves (default false). Note that this is largely incompatible with mouse-follows-focus
-focus-follows-mouse: false
+focus-follows-mouse: true
 
 # true if dragging and dropping windows on to each other should swap their positions (default false).
 mouse-swaps-windows: false

emacs/.emacs.d/modules/jg-dev.el

@@ -96,9 +96,6 @@
 (use-package yaml-mode
   :ensure t)
 
-(use-package terraform-mode
-  :ensure t)
-
 (use-package nix-mode
   :mode "\\.nix\\'")
 

guix/config.scm

@@ -81,7 +81,11 @@
 
   (services (append
 	      (modify-services %desktop-services
-			      (delete gdm-service-type))
+			       (delete gdm-service-type)
+                               (delete login-service-type)
+                               (delete mingetty-service-type)
+                               (delete console-font-service-type)
+                               )
               ;; Configure swaylock
               (list (service screen-locker-service-type
                         (screen-locker-configuration
@@ -89,6 +93,21 @@
                          (program (file-append swaylock "/bin/swaylock"))
                          (using-pam? #t)
                          (using-setuid? #f)))
+                    
+                    (service greetd-service-type
+                        (greetd-configuration
+                         (greeter-supplementary-groups (list "video" "input"))
+                         (terminals
+                          (list
+                           ;; TTY1 is the graphical login screen for Sway
+                           (greetd-terminal-configuration
+                            (terminal-vt "1")
+                            (terminal-switch #t)
+                            (default-session-command (greetd-wlgreet-sway-session))
+                            )
+
+                           (greetd-terminal-configuration (terminal-vt "2"))
+                           (greetd-terminal-configuration (terminal-vt "3"))))))                    
 	       )))
 
 

nix/configuration.nix

@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-
-{
-      # List packages installed in system profile. To search by name, run:
-      # $ nix-env -qaP | grep wget
-      environment.systemPackages =
-        [
-          pkgs.vim
-          pkgs.wget
-          pkgs.git
-          pkgs.htop
-        ];
-
-      environment.pathsToLink = [ "/share/zsh" ];
-
-      # Necessary for using flakes on this system.
-      nix.settings.experimental-features = "nix-command flakes";
-
-      # Enable alternative shell support in nix-darwin.
-      programs.zsh.enable = true;
-
-      # Set Git commit hash for darwin-version.
-      # system.configurationRevision = self.rev or self.dirtyRev or null;
-
-      # Used for backwards compatibility, please read the changelog before changing.
-      # $ darwin-rebuild changelog
-      system.stateVersion = 6;
-
-      # The platform the configuration will be used on.
-      nixpkgs.hostPlatform = "aarch64-darwin";
-
-      users.users.jgrogan = {
-        name = "jgrogan";
-        home = "/Users/jgrogan";};
-}
-  

nix/flake.lock

@@ -1,70 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751824240,
-        "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751313918,
-        "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
-        "owner": "nix-darwin",
-        "repo": "nix-darwin",
-        "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-darwin",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1751949589,
-        "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9b008d60392981ad674e04016d25619281550a9d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

nix/flake.nix

@@ -1,25 +0,0 @@
-{
-  description = "Darwin system config";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
-    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-  };
-
-  outputs = inputs@{ self, home-manager, nix-darwin, nixpkgs }: {
-    # Build darwin flake using:
-    # $ darwin-rebuild build --flake .#616-jgrogan
-    darwinConfigurations."616-jgrogan" = nix-darwin.lib.darwinSystem {
-      modules = [ ./configuration.nix
-                  home-manager.darwinModules.home-manager
-                  {
-                    home-manager.useGlobalPkgs = true;
-                    home-manager.useUserPackages = true;
-                    home-manager.users.jgrogan = ./home.nix;                  }
-                ];
-    };
-  };
-}

nix/home.nix

@@ -1,67 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.stateVersion = "25.05";
-
-  home.packages = [
-    pkgs.graphviz
-    pkgs.jq
-    pkgs.hunspell
-    pkgs.pandoc
-    pkgs.stow    
-
-    # # 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}!"
-    # '')
-  ];
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    sessionVariables = {CLICOLOR = 1;};
-    shellAliases = {pyact = "source .venv/bin/activate";};
-  };
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # You can also manage environment variables but you will have to manually
-  # source
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/davish/etc/profile.d/hm-session-vars.sh
-  #
-  # if you don't want to manage your shell through Home Manager.
-  home.sessionVariables = {
-    EDITOR = "vim";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}