summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--files/.config/alacritty/alacritty.toml4
-rw-r--r--files/.config/guix/channels.scm11
-rw-r--r--files/.config/sway/background.pngbin0 -> 7844869 bytes
-rw-r--r--files/.config/sway/config79
-rw-r--r--files/.gitconfig2
-rw-r--r--guix/home-configuration.scm34
-rw-r--r--nix/configuration.nix11
-rw-r--r--nix/home.nix79
9 files changed, 120 insertions, 102 deletions
diff --git a/README.md b/README.md
index e1156e5..7f3c184 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-this is my personal configuration. Dotfiles are in `files/`, Guix configuration in `guix/`, and Nix configuration in `nix/`. Just run `nixos-rebuild switch -I nix/configuration.nix`, copy `files/.config/guix/channels.scm` to `~/.config/guix/channels.scm` if it's a new system, then run `guix pull` and `guix home reconfigure guix/home-configuration.scm`
+this is my personal configuration. Dotfiles are in `files/`, Guix configuration in `guix/`, and Nix configuration in `nix/`. Just run `nixos-rebuild switch -I nixos-config=nix/configuration.nix` and `guix home reconfigure guix/home-configuration.scm` with the appropriate guix channels installed.
diff --git a/files/.config/alacritty/alacritty.toml b/files/.config/alacritty/alacritty.toml
index 9365fc8..58bc76a 100644
--- a/files/.config/alacritty/alacritty.toml
+++ b/files/.config/alacritty/alacritty.toml
@@ -35,9 +35,5 @@ text = '#ddc7a1'
[font]
size = 10
-[font.normal]
-family = 'Miracode'
-style = 'Regular'
-
[window]
opacity = 1.0
diff --git a/files/.config/guix/channels.scm b/files/.config/guix/channels.scm
deleted file mode 100644
index ef46dcb..0000000
--- a/files/.config/guix/channels.scm
+++ /dev/null
@@ -1,11 +0,0 @@
-(list (channel
- (name 'guix)
- (url "https://git.guix.gnu.org/guix.git")
- (branch "master")
- (commit
- "3afea42347535c72d985c8d69e06d6d1a0720b22")
- (introduction
- (make-channel-introduction
- "3afea42347535c72d985c8d69e06d6d1a0720b22"
- (openpgp-fingerprint
- "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
diff --git a/files/.config/sway/background.png b/files/.config/sway/background.png
new file mode 100644
index 0000000..a04e524
--- /dev/null
+++ b/files/.config/sway/background.png
Binary files differ
diff --git a/files/.config/sway/config b/files/.config/sway/config
new file mode 100644
index 0000000..dbc97f6
--- /dev/null
+++ b/files/.config/sway/config
@@ -0,0 +1,79 @@
+set $mod Mod4
+set $left h
+set $down j
+set $up k
+set $right l
+set $term alacritty
+set $menu wmenu-run
+set $screenshot grim -g "$(slurp)"
+floating_modifier $mod normal
+
+workspace_layout stacking
+output * bg /home/andromeda/.config/sway/background.png fill
+
+bindsym $mod+Shift+Return exec $term
+bindsym $mod+Shift+d exec $menu
+bindsym $mod+Shift+a exec anki
+bindsym $mod+Shift+q exec firefox
+bindsym $mod+Shift+s exec $screenshot
+
+bindsym $mod+Shift+c kill
+
+bindsym $mod+Shift+r reload
+
+bindsym $mod+Shift+Alt+q exit
+
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+
+bindsym $mod+1 workspace number 1
+bindsym $mod+2 workspace number 2
+bindsym $mod+3 workspace number 3
+bindsym $mod+4 workspace number 4
+bindsym $mod+5 workspace number 5
+bindsym $mod+6 workspace number 6
+bindsym $mod+7 workspace number 7
+bindsym $mod+8 workspace number 8
+bindsym $mod+9 workspace number 9
+bindsym $mod+0 workspace number 0
+
+bindsym $mod+Shift+1 move container to workspace number 1
+bindsym $mod+Shift+2 move container to workspace number 2
+bindsym $mod+Shift+3 move container to workspace number 3
+bindsym $mod+Shift+4 move container to workspace number 4
+bindsym $mod+Shift+5 move container to workspace number 5
+bindsym $mod+Shift+6 move container to workspace number 6
+bindsym $mod+Shift+7 move container to workspace number 7
+bindsym $mod+Shift+8 move container to workspace number 8
+bindsym $mod+Shift+9 move container to workspace number 9
+bindsym $mod+Shift+0 move container to workspace number 0
+
+seat * hide_cursor 100
+input type:touchpad events disabled
+
+bindsym $mod+r exec 'swaymsg "seat * hide_cursor 100"; swaymsg "input type:touchpad events disabled"'
+bindsym $mod+t exec 'swaymsg "seat * hide_cursor 0"; swaymsg "input type:touchpad events enabled"'
+
+bindsym $mod+f fullscreen
+bindsym $mod+Shift+space floating toggle
+bindsym $mod+Shift+minus move scratchpad
+bindsym $mod+minus scratchpad show
+
+bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+bindsym --locked XF86AudioMicMute exec pact set-source-mute \@DEFAULT_SOURCE@ toggle
+bindsym --locked XF86MonBrightnessDown exec brightnessctl set 2%-
+bindsym --locked XF86MonbrightnessUp exec brightnessctl set 2%+
+
+default_border none
+font pango:monospace 0.001
+titlebar_border_thickness 0
+titlebar_padding 0
diff --git a/files/.gitconfig b/files/.gitconfig
index d602b38..e83561c 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -3,3 +3,5 @@
email = andromeda@lenovo
[init]
defaultBranch = master
+[http]
+ sslCAinfo = /etc/ssl/certs/ca-certificates.crt
diff --git a/guix/home-configuration.scm b/guix/home-configuration.scm
index f2c0c9b..5746f5a 100644
--- a/guix/home-configuration.scm
+++ b/guix/home-configuration.scm
@@ -1,9 +1,11 @@
(use-modules (gnu home)
+ (gnu home services dotfiles)
+ (gnu home services guix)
+ (gnu home services shells)
(gnu packages)
(gnu services)
- (guix gexp)
- (gnu home services dotfiles)
- (gnu home services shells))
+ (guix channels)
+ (saayix packages binaries))
(home-environment
(packages
@@ -12,12 +14,15 @@
"alacritty"
"brightnessctl"
"btop"
+ "cinny-desktop-bin"
"du-dust"
"emacs-no-x"
"fzf"
"fastfetch"
"gdb"
"git"
+ "glib" ; needed for cinny
+ "gsettings-desktop-schemas" ; needed for cinny
"grim"
"hello"
"jmtpfs"
@@ -36,5 +41,26 @@
(services
(append (list (service home-dotfiles-service-type
(home-dotfiles-configuration
- (directories '("../files")))))
+ (directories '("../files"))))
+ (service home-channels-service-type
+ (list (channel
+ (name 'guix)
+ (url "https://git.guix.gnu.org/guix.git")
+ (branch "master")
+ (commit "3afea42347535c72d985c8d69e06d6d1a0720b22")
+ (introduction
+ (make-channel-introduction
+ "3afea42347535c72d985c8d69e06d6d1a0720b22"
+ (openpgp-fingerprint
+ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
+ (channel
+ (name 'saayix)
+ (branch "main")
+ (url "https://codeberg.org/look/saayix")
+ (commit "f0e272e58c9b758f2923ccd298e7eb857718c55f")
+ (introduction
+ (make-channel-introduction
+ "12540f593092e9a177eb8a974a57bb4892327752"
+ (openpgp-fingerprint
+ "3FFA 7335 973E 0A49 47FC 0A8C 38D5 96BE 07D3 34AB")))))))
%base-home-services)))
diff --git a/nix/configuration.nix b/nix/configuration.nix
index ec160fc..6be8100 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -112,17 +112,18 @@ in {
users.andromeda = {
directories = [
".backups"
- ".cache/guix"
+ ".cache/guix"
".config/guix"
".gnupg"
- ".local/share/AAAAXY"
+ #".local/share/AAAAXY"
".local/share/Anki2"
- ".local/share/chat.fluffy.fluffychat"
- ".local/share/Mindustry"
+ #".local/share/chat.fluffy.fluffychat"
+ ".local/share/cinny"
+ ".local/share/in.cinny.app"
+ #".local/share/Mindustry"
".local/share/zoxide"
".ssh"
"conf"
- "conf_v1"
"Downloads"
"pp"
];
diff --git a/nix/home.nix b/nix/home.nix
index e842e34..5663bd2 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -1,68 +1,24 @@
{
config,
- lib,
pkgs,
...
}: let
sources = import ./npins;
- background-path = ".config/sway/background.png";
- sway_config =
- pkgs.substitute
- {
- src = ./home/sway_config;
- substitutions = [
- "--replace"
- "@backgroundImagePath@"
- "${config.home.homeDirectory}/${background-path}"
- ];
- };
in {
home = {
- file = {
- ${background-path}.source = config.stylix.image;
- ".profile".enable = false;
- };
+ file.".profile".enable = false;
homeDirectory = "/home/${config.home.username}";
packages = [
- pkgs.aaaaxy
- #pkgs.acpi
(pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" {})
- #pkgs.alacritty
pkgs.anki
- #(import "${sources.anki-cli}/package.nix")
- #pkgs.c3term
- #pkgs.brightnessctl
- #pkgs.dust
- pkgs.fluffychat
- #pkgs.fzf
- #pkgs.gdb
- pkgs.glow
- #pkgs.grim
- #pkgs.hexdump
- pkgs.http-server
- #pkgs.jmtpfs
pkgs.mindustry-wayland
- #pkgs.nasm
pkgs.nix-output-monitor
pkgs.npins
- #pkgs.pciutils
- #pkgs.ranger
- pkgs.rip2
- #pkgs.ripgrep
- #pkgs.slurp
- #pkgs.tokei
- #pkgs.tree
- #pkgs.usbutils
- #pkgs.wget
- #pkgs.xxd
];
stateVersion = "26.05";
username = "andromeda";
};
- imports = [
- (import sources.nvf).homeManagerModules.nvf
- (import sources.stylix).homeModules.stylix
- ];
+ imports = [(import sources.nvf).homeManagerModules.nvf];
programs = {
firefox = {
enable = true;
@@ -80,7 +36,6 @@ in {
};
};
};
- gh.enable = true;
gpg.enable = true;
home-manager.enable = true;
nvf = {
@@ -181,37 +136,7 @@ in {
enable = true;
pinentry.package = pkgs.pinentry-curses;
};
- stylix = {
- base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-hard.yaml";
- enable = true;
- fonts = {
- emoji = {
- name = "Noto Color Emoji";
- package = pkgs.noto-fonts-color-emoji;
- };
- monospace = {
- name = "Miracode";
- package = pkgs.miracode;
- };
- serif = config.stylix.fonts.sansSerif;
- sizes = {
- applications = 10;
- terminal = 10;
- };
- };
- image = "${pkgs.nixos-artwork.wallpapers.gear}/share/backgrounds/nixos/nix-wallpaper-gear.png";
- polarity = "dark";
- cursor = {
- name = "Hackneyed";
- package = pkgs.hackneyed;
- size = 16;
- };
- };
- wayland.windowManager.sway.enable = true;
xdg = {
- configFile = {
- "sway/config".source = lib.mkForce sway_config;
- };
portal = {
enable = true;
extraPortals = [pkgs.xdg-desktop-portal-shana];
generated by cgit v1.3 (git 2.53.0) at 2026-05-07 00:54:09 +0000