diff options
| -rw-r--r-- | files/.bashrc | 2 | ||||
| -rw-r--r-- | files/.config/sway/config | 7 | ||||
| -rw-r--r-- | galaxious/configuration.nix | 56 | ||||
| -rw-r--r-- | guix/home-configuration.scm | 7 | ||||
| -rw-r--r-- | laptop/configuration.nix (renamed from nix/configuration.nix) | 5 | ||||
| -rw-r--r-- | laptop/home.nix (renamed from nix/home.nix) | 2 | ||||
| -rw-r--r-- | laptop/home/sway_config (renamed from nix/home/sway_config) | 0 | ||||
| -rw-r--r-- | laptop/patches/change-default-search-engine.patch (renamed from nix/patches/change-default-search-engine.patch) | 0 | ||||
| -rw-r--r-- | npins/default.nix (renamed from nix/npins/default.nix) | 0 | ||||
| -rw-r--r-- | npins/sources.json (renamed from nix/npins/sources.json) | 0 | ||||
| -rw-r--r-- | pub-keys.nix (renamed from nix/pub-keys.nix) | 0 | ||||
| -rw-r--r-- | secrets.nix (renamed from nix/secrets.nix) | 0 | ||||
| -rw-r--r-- | secrets/andromeda-pw.age (renamed from nix/secrets/andromeda-pw.age) | 0 | ||||
| -rw-r--r-- | secrets/secrets.nix (renamed from nix/secrets/secrets.nix) | 0 |
14 files changed, 69 insertions, 10 deletions
diff --git a/files/.bashrc b/files/.bashrc index 46c8271..8e93e38 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -42,7 +42,7 @@ export GPG_TTY HISTFILESIZE=100000 HISTSIZE=10000 PS1="\u@\h:\w$" -SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt" +CURL_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" GUIX_PROFILE="/home/andromeda/.config/guix/current" . "$GUIX_PROFILE/etc/profile" diff --git a/files/.config/sway/config b/files/.config/sway/config index cd884db..f70efd1 100644 --- a/files/.config/sway/config +++ b/files/.config/sway/config @@ -58,7 +58,10 @@ bindsym $mod+Shift+0 move container to workspace number 0 seat * hide_cursor 100 input type:touchpad events disabled -input type:keyboard xkb_options ctrl:nocaps +input type:keyboard xkb_options lv5:ralt_switch +input type:keyboard xkb_options caps:mod3 +input type:keyboard xkb_layout de +input type:keyboard xkb_variant neo 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"' @@ -78,4 +81,4 @@ bindsym --locked XF86MonbrightnessUp exec brightnessctl set 2%+ default_border none font pango:monospace 0.001 titlebar_border_thickness 0 -titlebar_padding 0
\ No newline at end of file +titlebar_padding 0 diff --git a/galaxious/configuration.nix b/galaxious/configuration.nix new file mode 100644 index 0000000..9066c64 --- /dev/null +++ b/galaxious/configuration.nix @@ -0,0 +1,56 @@ +{ ... }: let + sources = import ../npins; + pkgs = import sources.nixpkgs {}; + modulesPath = "${nixpkgs}/nixos/modules"; +in { + boot = { + initrd = { + availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" ]; + kernelModules = [ "nvme" ]; + }; + kernelPackages = pkgs.linuxPackages_latest; + loader = { + grub.device = "/dev/sda"; + timeout = 30; + }; + tmp.cleanOnBoot = true; + }; + fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; }; + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; + networking = { + domain = "contaboserver.net"; + hostName = "vmi2998419"; + useNetworkd = true; + usePredictableInterfaceNames = true; + }; + nix = { + channel.enable = false; + settings = { + experimental-features = "flakes nix-command"; + trusted-users = ["@wheel"]; + }; + }; + nixpkgs = { + config.allowUnfree = false; + flake.source = sources.nixpkgs; + hostPlatform = "x86_64-linux"; + }; + services.openssh.enable = true; + systemd.network = { + enable = true; + networks."40-wan" = { + address = [ "2a02:c207:2299:8419::1/64" "109.199.104.83/20" ]; + dns = [ "2020:fe::10" "9.9.9.10" ]; + matchConfig.Name = "enx0050565f4fff"; + routes = [ { Gateway = "109.199.96.1"; GatewayOnLink = true; } { Gateway = "fe80::1"; } ]; + }; + }; + system.stateVersion = "25.11"; + users = { + mutableUsers = false; + users.root = { + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJy2VD362wUcu0lKj2d6OIU8dbAna0Lu/NaAYIj8gdIA andromeda@lenovo" ]; + }; + }; + zramSwap.enable = true; +} diff --git a/guix/home-configuration.scm b/guix/home-configuration.scm index 12fa1ac..3bd8270 100644 --- a/guix/home-configuration.scm +++ b/guix/home-configuration.scm @@ -17,13 +17,12 @@ "cinny-desktop-bin" "du-dust" "emacs-no-x" + "emacs-nix-mode" "emacs-ement" "fzf" "fastfetch" "gdb" "git" - "glib" ; needed for cinny - "gsettings-desktop-schemas" ; needed for cinny "grim" "hello" "jmtpfs" @@ -56,9 +55,9 @@ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))) (channel (name 'saayix) - (branch "main") + (branch "entropy") (url "https://codeberg.org/look/saayix") - (commit "f0e272e58c9b758f2923ccd298e7eb857718c55f") + (commit "ab0adebdf48794f7c0659785c6c4ddd2220e3cf0") (introduction (make-channel-introduction "12540f593092e9a177eb8a974a57bb4892327752" diff --git a/nix/configuration.nix b/laptop/configuration.nix index 6be8100..6efd55a 100644 --- a/nix/configuration.nix +++ b/laptop/configuration.nix @@ -1,5 +1,5 @@ {config, ...}: let - sources = import ./npins; + sources = import ../npins; pkgs = import sources.nixpkgs {}; in { boot = { @@ -171,7 +171,7 @@ in { "${sources.agenix {inherit pkgs;}}/modules/age.nix" "${sources.impermanence {inherit pkgs;}}/nixos.nix" "${sources.home-manager {inherit pkgs;}}/nixos" - ./secrets.nix + ../secrets.nix ]; networking = { domain = "nixos"; @@ -222,6 +222,7 @@ in { libinput.enable = true; openssh.enable = true; printing.enable = true; + xserver.xkb.layout = "de(neo)"; }; system.stateVersion = "26.05"; time.timeZone = "Europe/Berlin"; diff --git a/nix/home.nix b/laptop/home.nix index 5663bd2..0f98005 100644 --- a/nix/home.nix +++ b/laptop/home.nix @@ -3,7 +3,7 @@ pkgs, ... }: let - sources = import ./npins; + sources = import ../npins; in { home = { file.".profile".enable = false; diff --git a/nix/home/sway_config b/laptop/home/sway_config index af46e4e..af46e4e 100644 --- a/nix/home/sway_config +++ b/laptop/home/sway_config diff --git a/nix/patches/change-default-search-engine.patch b/laptop/patches/change-default-search-engine.patch index eea0845..eea0845 100644 --- a/nix/patches/change-default-search-engine.patch +++ b/laptop/patches/change-default-search-engine.patch diff --git a/nix/npins/default.nix b/npins/default.nix index 884fc8c..884fc8c 100644 --- a/nix/npins/default.nix +++ b/npins/default.nix diff --git a/nix/npins/sources.json b/npins/sources.json index 93e4442..93e4442 100644 --- a/nix/npins/sources.json +++ b/npins/sources.json diff --git a/nix/pub-keys.nix b/pub-keys.nix index 8de2f7a..8de2f7a 100644 --- a/nix/pub-keys.nix +++ b/pub-keys.nix diff --git a/nix/secrets.nix b/secrets.nix index fd1c166..fd1c166 100644 --- a/nix/secrets.nix +++ b/secrets.nix diff --git a/nix/secrets/andromeda-pw.age b/secrets/andromeda-pw.age index 0c65df4..0c65df4 100644 --- a/nix/secrets/andromeda-pw.age +++ b/secrets/andromeda-pw.age diff --git a/nix/secrets/secrets.nix b/secrets/secrets.nix index 6dc4059..6dc4059 100644 --- a/nix/secrets/secrets.nix +++ b/secrets/secrets.nix |