diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index b5ff736..b89ff26 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -32,7 +32,9 @@
(prepend gcc-12)))))
(define %home-symlinks
- `((".config/guix/home-config/fish" ".config/fish")))
+ `((".config/guix/home-config/fish" ".config/fish")
+ (".config/guix/home-config/nix-config" ".config/nix")
+ (".config/guix/home-config/nix-home-manager" ".config/home-manager")))
(home-symlinks %home-symlinks)
@@ -150,9 +152,7 @@
("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))
("waybar" ,(local-file "waybar" #:recursive? #t))
("alacritty" ,(local-file "alacritty" #:recursive? #t))
- ("aerc" ,(local-file "aerc" #:recursive? #t))
- ("home-manager" ,(local-file "nix-home-manager" #:recursive? #t))
- ("nix" ,(local-file "nix-config" #:recursive? #t)) ))
+ ("aerc" ,(local-file "aerc" #:recursive? #t)) ))
(service home-files-service-type
`((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
(".ssh/config" ,(local-file "ssh/config"))
diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock
index 0356e26..8a9fdd3 100644
--- a/home-config/nix-home-manager/flake.lock
+++ b/home-config/nix-home-manager/flake.lock
@@ -1,5 +1,79 @@
{
"nodes": {
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-utils": {
+ "inputs": {
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1710146030,
+ "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "gomod2nix": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs": [
+ "superfile",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1710154385,
+ "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=",
+ "owner": "nix-community",
+ "repo": "gomod2nix",
+ "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "gomod2nix",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -60,7 +134,61 @@
"inputs": {
"home-manager": "home-manager",
"hyprpicker-git": "hyprpicker-git",
- "nixpkgs": "nixpkgs"
+ "nixpkgs": "nixpkgs",
+ "superfile": "superfile"
+ }
+ },
+ "superfile": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "flake-utils": "flake-utils",
+ "gomod2nix": "gomod2nix",
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1715556404,
+ "narHash": "sha256-lG4hvdi0JNOG1s05UrmDKxwhk6TrFDWZsxHrWGw6vCM=",
+ "owner": "MHNightCat",
+ "repo": "superfile",
+ "rev": "eaed7829b07de14528ac203aad8a5ac5c04c68ef",
+ "type": "github"
+ },
+ "original": {
+ "owner": "MHNightCat",
+ "repo": "superfile",
+ "type": "github"
+ }
+ },
+ "systems": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
+ "systems_2": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
}
}
},
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index 8e1b937..88405d0 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -12,9 +12,13 @@
url = "github:hyprwm/hyprpicker";
inputs.nixpkgs.follows = "nixpkgs";
};
+ superfile = {
+ url = "github:MHNightCat/superfile";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
};
- outputs = { nixpkgs, home-manager, hyprpicker-git, ... }:
+ outputs = { nixpkgs, home-manager, hyprpicker-git, superfile, ... }:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
@@ -34,6 +38,7 @@
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
+ extraSpecialArgs = {inherit inputs;};
};
};
}
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index 9d712dc..9433801 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -43,6 +43,7 @@
gdu
spotify-player
hyprpicker
+ superfile
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
diff --git a/home-config/ssh/config b/home-config/ssh/config
index 1b8e4bf..45132d7 100644
--- a/home-config/ssh/config
+++ b/home-config/ssh/config
@@ -12,5 +12,9 @@ Host hetzner
HostName 5.161.207.21
User root
+Host rncorepub
+ Hostname 5.161.89.186
+ User root
+
Host *
KexAlgorithms -sntrup761x25519-sha512@openssh.com
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 2b1f3d8..5d66985 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -131,7 +131,7 @@
"adwaita-icon-theme"
"hicolor-icon-theme"
"git"
- "waybar"
+ ;"waybar"
"gnupg"
"light"
"avahi"
@@ -158,7 +158,7 @@
"wireplumber"
"wireshark"
"zsh"))
- (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new)
+ (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new waybar-new)
%my-base-packages ))
;; Below is the list of system services. To search for available