diff --git a/README.md b/README.md index 400ff77f..23e8061d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ This repo is managed with Nix + GNU stow # Hosts - vanadium: Framework 13 (AMD 7040 Series) -- tungsten: MacBook Air 2014 (because it gets really hot) # Linux - Window Manager : XMonad, flipped master/slave[^1] layout, 8 workspaces diff --git a/default.nix b/default.nix index b48316b8..7deece54 100644 --- a/default.nix +++ b/default.nix @@ -8,10 +8,6 @@ system = "x86_64-linux"; modules = [./nix/configurations/vanadium.nix]; }; - tungsten = { - system = "x86_64-linux"; - modules = [./nix/configurations/tungsten.nix]; - }; installer = { system = "x86_64-linux"; modules = [./nix/configurations/installer.nix]; diff --git a/nix/configurations/installer.nix b/nix/configurations/installer.nix index d478b631..44ae03b3 100644 --- a/nix/configurations/installer.nix +++ b/nix/configurations/installer.nix @@ -14,8 +14,6 @@ ../nixosModules/common/system-nixconf.nix (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") - - # ./installer/tungsten.nix ]; nix.settings = { diff --git a/nix/configurations/installer/tungsten.nix b/nix/configurations/installer/tungsten.nix deleted file mode 100644 index 8388ad77..00000000 --- a/nix/configurations/installer/tungsten.nix +++ /dev/null @@ -1,11 +0,0 @@ -{lib, ...}: { - imports = [ - ../../nixosModules/extra/macbook-swap-fn-ctrl.nix - ../../configurations/tungsten/nixos/hardware-configuration.nix - ]; - - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "broadcom-sta" # wifi driver - ]; -} diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix deleted file mode 100644 index 70cf2b9c..00000000 --- a/nix/configurations/tungsten.nix +++ /dev/null @@ -1,189 +0,0 @@ -# Entry point to cherry pick modules -let - sources = import ../../npins; - - hostname = "tungsten"; - username = "leana"; -in - { - config, - lib, - ... - }: let - inherit (lib.modules) mkAliasOptionModule; - in { - imports = [ - # - # Shorthands - # - (mkAliasOptionModule ["me"] ["users" "users" username]) - (mkAliasOptionModule ["hm"] ["home-manager" "users" username]) - - # - # hostname - # - {_module.args = {inherit hostname;};} - - # - # nixpkgs - # - { - nixpkgs = { - overlays = map import [ - ../overlays/agenix.nix - ../overlays/disko.nix - ../overlays/nur.nix - ../overlays/wired-notify.nix - ../overlays/nix-tree.nix - - ../packages/overlay.nix - ]; - - # Set NIX_PATH and flake registry at the same time - # https://github.com/NixOS/nixpkgs/pull/254405 - flake.source = sources.nixpkgs; - }; - - system.nixos.version = lib.substring 0 8 sources.nixpkgs.revision; - } - - # - # NixOS modules - # - ./tungsten/nixos/hardware-configuration.nix # generated - ./tungsten/nixos/fs.nix - ./tungsten/nixos/restic.nix - - ./tungsten/nixos/battery.nix - - ./tungsten/nixos/audio.nix - ./tungsten/nixos/connectivity.nix - ./tungsten/nixos/input.nix - - ./tungsten/nixos/misc.nix - - ./tungsten/nixos/display.nix - ./tungsten/nixos/gui.nix - - ./tungsten/nixos/locale.nix - ./tungsten/nixos/unfree-predicate.nix - ./tungsten/nixos/programs.nix - - ../nixosModules/common/disable-command-not-found.nix - ../nixosModules/common/network.nix - ../nixosModules/common/sudo-conf.nix - ../nixosModules/common/system-nixconf.nix - - ../nixosModules/extra/zram.nix - ../nixosModules/extra/leana.nix - - ../nixosModules/extra/macbook-swap-fn-ctrl.nix - ../nixosModules/extra/macbook-swap-cmd-opt.nix - - # - # Extern modules - # - (sources.disko + "/module.nix") - ../disko/tungsten/btrfs.nix - - (sources.agenix + "/modules/age.nix") - - (import sources.url-eater).nixosModules.default - - (sources.nixos-hardware + "/apple/macbook-air/6") - - (import (sources.lix-module + "/module.nix") {inherit (sources) lix;}) - - # - # home-manager - # - (sources.home-manager + "/nixos") - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - sharedModules = [{home.stateVersion = lib.mkDefault config.system.stateVersion;}]; - }; - - hm.imports = [ - # - # hostname - # - {_module.args = {inherit hostname;};} - - # - # home modules - # - ./tungsten/home/programs.nix - ./tungsten/home/misc.nix - - ./tungsten/home/firefox.nix - ./tungsten/home/xmobar.nix - - # Language server packages, etc - ./tungsten/home/dev.nix - - ../homeModules/common/btop - ../homeModules/common/cmus - ../homeModules/common/fcitx5 - ../homeModules/common/fish - ../homeModules/common/starship - ../homeModules/common/tmux - ../homeModules/common/vim - ../homeModules/common/wired - ../homeModules/common/atuin.nix - ../homeModules/common/direnv.nix - ../homeModules/common/feh.nix - ../homeModules/common/firefox.nix - ../homeModules/common/fzf.nix - ../homeModules/common/git.nix - ../homeModules/common/gpg.nix - ../homeModules/common/kitty.nix - ../homeModules/common/leana.nix - ../homeModules/common/locale.nix - ../homeModules/common/packages.nix - ../homeModules/common/password-store.nix - ../homeModules/common/sioyek.nix - ../homeModules/common/user-nixconf.nix - - ../homeModules/extra/tmux-fish-integration.nix - - # - # Extern modules - # - (sources.agenix + "/modules/age-home.nix") - (import sources.wired-notify).homeManagerModules.default - ]; - } - - # - # Secrets - # - { - age.secrets = { - wpa_password.file = "${../secrets/wpa_password.age}"; - - restic_backblaze_pwd.file = "${../secrets/restic_backblaze_pwd.age}"; - restic_backblaze_repo.file = "${../secrets/restic_backblaze_repo.age}"; - restic_backblaze_env.file = "${../secrets/restic_backblaze_env.age}"; - - four_pwd.file = "${../secrets/four_pwd.age}"; - restic_four_pwd.file = "${../secrets/restic_four_pwd.age}"; - - sgbk_pwd.file = "${../secrets/sgbk_pwd.age}"; - restic_sgbk_pwd.file = "${../secrets/restic_sgbk_pwd.age}"; - - two_pwd.file = "${../secrets/two_pwd.age}"; - }; - - hm = { - age.secrets = { - sshconfig = { - file = "${../secrets/sshconfig.age}"; - path = "/home/leana/.ssh/config"; - }; - }; - }; - } - ]; - } diff --git a/nix/configurations/tungsten/home/dev.nix b/nix/configurations/tungsten/home/dev.nix deleted file mode 100644 index 4ede0395..00000000 --- a/nix/configurations/tungsten/home/dev.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - programs.neovim.extraPackages = [ - # lua - pkgs.lua-language-server - pkgs.stylua - - pkgs.nil # nix - ]; - - programs.git = { - enable = true; - signing.signByDefault = true; - maintenance = { - enable = true; - repositories = - lib.map (path: config.home.homeDirectory + "/${path}") - [ - "r/nixos/nixpkgs" - ]; - }; - }; - - programs.gpg.enable = true; -} diff --git a/nix/configurations/tungsten/home/firefox.nix b/nix/configurations/tungsten/home/firefox.nix deleted file mode 100644 index 50823048..00000000 --- a/nix/configurations/tungsten/home/firefox.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - pkgs, - config, - ... -}: let - inherit (pkgs) nur; -in { - programs.firefox = { - enable = true; - - policies.SearchEngines = { - Default = "searxng"; - Add = [ - { - Name = "searxng"; - URLTemplate = "https://sxng.confusedcompiler.org/search?q={searchTerms}"; - } - ]; - }; - - profiles = { - default = { - extensions.packages = let - addons = nur.repos.rycee.firefox-addons; - in [ - addons.languagetool - - addons.sponsorblock - addons.return-youtube-dislikes - - addons.shinigami-eyes - ]; - }; - - junk = { - id = 1; - inherit - (config.programs.firefox.profiles.default) - settings - userChrome - ; - - extensions.packages = let - addons = nur.repos.rycee.firefox-addons; - in [addons.multi-account-containers]; - - containers = { - raisin = { - color = "purple"; - icon = "fruit"; - id = 1; - }; - pomme = { - color = "red"; - icon = "fruit"; - id = 2; - }; - }; - }; - - # Isolate it because it's proprietary - tampermonkey = { - id = 2; - inherit - (config.programs.firefox.profiles.default) - settings - userChrome - ; - - extensions.packages = let - addons = nur.repos.rycee.firefox-addons; - in [addons.tampermonkey]; - }; - }; - }; -} diff --git a/nix/configurations/tungsten/home/misc.nix b/nix/configurations/tungsten/home/misc.nix deleted file mode 100644 index 76673db8..00000000 --- a/nix/configurations/tungsten/home/misc.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - pkgs, - lib, - nixosConfig ? {}, - ... -}: { - # - # fonts - # - fonts.fontconfig = { - enable = true; - defaultFonts = lib.mapAttrsRecursive (_: v: v ++ ["Last Resort"]) { - sansSerif = ["Ubuntu" "Noto Sans CJK TC"]; - serif = ["Noto Serif CJK TC"]; - monospace = ["Iosevka"]; - emoji = ["Noto Color Emoji"]; - }; - }; - home.packages = [ - pkgs.noto-fonts - pkgs.noto-fonts-lgc-plus - pkgs.noto-fonts-cjk-sans - pkgs.noto-fonts-cjk-serif - pkgs.noto-fonts-color-emoji - pkgs.noto-fonts-emoji-blob-bin - pkgs.ubuntu-classic - pkgs.iosevka - pkgs.last-resort - ]; - - home.file = { - ".xscreensaver".source = "${./xscreensaver/.xscreensaver}"; - }; - home.pointerCursor = { - x11.enable = true; - gtk.enable = true; - - inherit - (nixosConfig.services.xserver.displayManager.lightdm.greeters.gtk.cursorTheme) - name - package - size - ; - }; - xresources.properties."Xft.dpi" = 92; - i18n.inputMethod = { - enable = true; - type = "fcitx5"; - }; - - xdg.mimeApps = { - enable = true; - associations.added."x-scheme-handler/mailto" = ["org.gnome.Evolution.desktop"]; - defaultApplications."x-scheme-handler/mailto" = ["org.gnome.Evolution.desktop"]; - }; -} diff --git a/nix/configurations/tungsten/home/programs.nix b/nix/configurations/tungsten/home/programs.nix deleted file mode 100644 index ce5d834e..00000000 --- a/nix/configurations/tungsten/home/programs.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - home.sessionVariables = let - fishCfg = config.programs.fish; - in { - "SHELL" = lib.mkIf fishCfg.enable (lib.getExe fishCfg.package); - }; - - imports = [ - # - # CLI / TUI - # - { - home.packages = [ - pkgs.stow - pkgs.zip - pkgs.unzip - pkgs.gnutar - pkgs.p7zip - pkgs.bc - pkgs.dig - pkgs.hutils - pkgs.miniserve - pkgs.agenix - - # pretty tui tools - pkgs.du-dust - pkgs.tldr - pkgs.tokei - pkgs.hyperfine - pkgs.watchexec - pkgs.onefetch - pkgs.just - - # nix tools - pkgs.alejandra - pkgs.nix-output-monitor - pkgs.nix-tree - pkgs.nurl - pkgs.nvd - pkgs.niv - pkgs.npins - ]; - programs = { - neovim.enable = true; - neovim.defaultEditor = true; - fish.enable = true; - starship.enable = true; - tmux.enable = true; - direnv.enable = true; - ripgrep.enable = true; - - password-store.enable = true; - - btop.enable = true; - - cmus.enable = true; - }; - } - - # - # GUI - # - { - home.packages = [ - pkgs.vlc - pkgs.nautilus - pkgs.sushi # space bar previewer - - # wm utilities - pkgs.xbrightness - pkgs.dmenu - pkgs.xclip - pkgs.xscreensaver # talk to xscreensaver - pkgs.xcolor - - # audio utilities - pkgs.helvum - pkgs.pavucontrol - ]; - - programs = { - feh.enable = true; - sioyek.enable = true; - - kitty = { - enable = true; - settings.shell = lib.getExe config.programs.fish.package; - }; - }; - - services = { - wired.enable = true; - playerctld.enable = true; - gpg-agent.enable = true; - - gnome-keyring = { - enable = true; - components = ["secrets"]; - }; - }; - } - ]; -} diff --git a/nix/configurations/tungsten/home/xmobar.nix b/nix/configurations/tungsten/home/xmobar.nix deleted file mode 100644 index 55ff9f6c..00000000 --- a/nix/configurations/tungsten/home/xmobar.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - programs.xmobar = { - enable = true; - extraConfig = '' - Config { overrideRedirect = False - , font = "Iosevka 13" - , bgColor = "#000000" - , fgColor = "#FFFFFF" - , position = BottomH 30 - , commands = [ Run Date "%a %d %H:%M:%S" "date" 10 - , Run Battery - [ "-t", " ()" - , "-H", "70" - , "-L", "20" - , "-h", "green" - , "-n", "orange" - , "-l", "red" - , "--" - , "-P" - , "-A", "20" - , "-a", "notify-send -u critical \"Battery Low\" \"Please charge your battery\"" - ] 10 - , Run XMonadLog - , Run - DynNetwork - [ "--template" - , ": ↑ kB/s ↓ kB/s" - , "--Low" - , "102400" - , "--High" - , "1024000" - , "--low" - , "green" - , "--normal" - , "orange" - , "--high" - , "red" - ] - 10 - ] - , sepChar = "%" - , alignSep = "}{" - , template = " %XMonadLog% }{ %dynnetwork% | %battery% | %date% " - } - ''; - }; -} diff --git a/nix/configurations/tungsten/home/xscreensaver/.xscreensaver b/nix/configurations/tungsten/home/xscreensaver/.xscreensaver deleted file mode 100644 index 235e685e..00000000 --- a/nix/configurations/tungsten/home/xscreensaver/.xscreensaver +++ /dev/null @@ -1,299 +0,0 @@ -# XScreenSaver Preferences File -# Written by xscreensaver-settings 6.08 for leana on Tue Jul 23 23:44:33 2024. -# https://www.jwz.org/xscreensaver/ - -timeout: 0:07:00 -cycle: 0:07:00 -lock: True -lockTimeout: 0:00:00 -passwdTimeout: 0:00:30 -visualID: default -installColormap: True -verbose: False -splash: True -splashDuration: 0:00:05 -demoCommand: xscreensaver-settings -nice: 10 -fade: False -unfade: False -fadeSeconds: 0:00:03 -ignoreUninstalledPrograms:False -dpmsEnabled: True -dpmsQuickOff: False -dpmsStandby: 0:10:00 -dpmsSuspend: 0:10:00 -dpmsOff: 0:15:00 -grabDesktopImages: True -grabVideoFrames: False -chooseRandomImages: False -imageDirectory: - -mode: one -selected: 204 - -textMode: url -textLiteral: XScreenSaver -textFile: -textProgram: fortune -textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss -dialogTheme: default -settingsGeom: 15,32 216,222 - -programs: \ - maze --root \n\ - GL: superquadrics --root \n\ - attraction --root \n\ - blitspin --root \n\ - greynetic --root \n\ - helix --root \n\ - hopalong --root \n\ - imsmap --root \n\ -- noseguy --root \n\ -- pyro --root \n\ - qix --root \n\ -- rocks --root \n\ - rorschach --root \n\ - decayscreen --root \n\ - flame --root \n\ - halo --root \n\ - slidescreen --root \n\ - pedal --root \n\ - bouboule --root \n\ -- braid --root \n\ - coral --root \n\ - deco --root \n\ - drift --root \n\ -- fadeplot --root \n\ - galaxy --root \n\ - goop --root \n\ - grav --root \n\ - ifs --root \n\ - GL: jigsaw --root \n\ - julia --root \n\ -- kaleidescope --root \n\ - GL: moebius --root \n\ - moire --root \n\ - GL: morph3d --root \n\ - mountain --root \n\ - munch --root \n\ - penrose --root \n\ - GL: pipes --root \n\ - rdbomb --root \n\ - GL: rubik --root \n\ -- sierpinski --root \n\ - slip --root \n\ - GL: sproingies --root \n\ - starfish --root \n\ - strange --root \n\ - swirl --root \n\ - triangle --root \n\ - xjack --root \n\ - xlyap --root \n\ - GL: atlantis --root \n\ - bsod --root \n\ - GL: bubble3d --root \n\ - GL: cage --root \n\ -- crystal --root \n\ - cynosure --root \n\ - discrete --root \n\ - distort --root \n\ - epicycle --root \n\ - flow --root \n\ - GL: glplanet --root \n\ - interference --root \n\ - kumppa --root \n\ - GL: lament --root \n\ - moire2 --root \n\ - GL: sonar --root \n\ - GL: stairs --root \n\ - truchet --root \n\ -- vidwhacker --root \n\ -- webcollage --root \n\ - blaster --root \n\ - bumps --root \n\ - ccurve --root \n\ - compass --root \n\ - deluxe --root \n\ -- demon --root \n\ - GL: extrusion --root \n\ -- loop --root \n\ - penetrate --root \n\ - petri --root \n\ - phosphor --root \n\ - GL: pulsar --root \n\ - ripples --root \n\ - shadebobs --root \n\ - GL: sierpinski3d --root \n\ - spotlight --root \n\ - squiral --root \n\ - wander --root \n\ - xflame --root \n\ - xmatrix --root \n\ - GL: gflux --root \n\ -- nerverot --root \n\ - xrayswarm --root \n\ - xspirograph --root \n\ - GL: circuit --root \n\ - GL: dangerball --root \n\ -- GL: dnalogo --root \n\ - GL: engine --root \n\ - GL: flipscreen3d --root \n\ - GL: gltext --root \n\ - GL: menger --root \n\ - GL: molecule --root \n\ - rotzoomer --root \n\ - scooter --root \n\ - speedmine --root \n\ - GL: starwars --root \n\ - GL: stonerview --root \n\ - vermiculate --root \n\ - whirlwindwarp --root \n\ - zoom --root \n\ - anemone --root \n\ - apollonian --root \n\ - GL: boxed --root \n\ - GL: cubenetic --root \n\ - GL: endgame --root \n\ - euler2d --root \n\ - fluidballs --root \n\ - GL: flurry --root \n\ -- GL: glblur --root \n\ - GL: glsnake --root \n\ - halftone --root \n\ - GL: juggler3d --root \n\ - GL: lavalite --root \n\ -- polyominoes --root \n\ - GL: queens --root \n\ -- GL: sballs --root \n\ - GL: spheremonics --root \n\ - twang --root \n\ -- GL: antspotlight --root \n\ - apple2 --root \n\ - GL: atunnel --root \n\ - barcode --root \n\ - GL: blinkbox --root \n\ - GL: blocktube --root \n\ - GL: bouncingcow --root \n\ - cloudlife --root \n\ - GL: cubestorm --root \n\ - eruption --root \n\ - GL: flipflop --root \n\ - GL: flyingtoasters --root \n\ - fontglide --root \n\ - GL: gleidescope --root \n\ - GL: glknots --root \n\ - GL: glmatrix --root \n\ -- GL: glslideshow --root \n\ - GL: hypertorus --root \n\ -- GL: jigglypuff --root \n\ - metaballs --root \n\ - GL: mirrorblob --root \n\ - piecewise --root \n\ - GL: polytopes --root \n\ - pong --root \n\ - popsquares --root \n\ - GL: surfaces --root \n\ - xanalogtv --root \n\ - abstractile --root \n\ - anemotaxis --root \n\ -- GL: antinspect --root \n\ - fireworkx --root \n\ - fuzzyflakes --root \n\ - interaggregate --root \n\ - intermomentary --root \n\ - memscroller --root \n\ - GL: noof --root \n\ - pacman --root \n\ - GL: pinion --root \n\ - GL: polyhedra --root \n\ -- GL: providence --root \n\ - substrate --root \n\ - wormhole --root \n\ -- GL: antmaze --root \n\ - GL: boing --root \n\ - boxfit --root \n\ - GL: carousel --root \n\ - celtic --root \n\ - GL: crackberg --root \n\ - GL: cube21 --root \n\ - fiberlamp --root \n\ - GL: fliptext --root \n\ - GL: glhanoi --root \n\ - GL: tangram --root \n\ - GL: timetunnel --root \n\ - GL: glschool --root \n\ - GL: topblock --root \n\ - GL: cubicgrid --root \n\ - cwaves --root \n\ - GL: gears --root \n\ - GL: glcells --root \n\ - GL: lockward --root \n\ - m6502 --root \n\ - GL: moebiusgears --root \n\ - GL: voronoi --root \n\ - GL: hypnowheel --root \n\ - GL: klein --root \n\ -- lcdscrub --root \n\ - GL: photopile --root \n\ - GL: skytentacles --root \n\ - GL: rubikblocks --root \n\ - GL: companioncube --root \n\ - GL: hilbert --root \n\ - GL: tronbit --root \n\ - GL: geodesic --root \n\ - hexadrop --root \n\ - GL: kaleidocycle --root \n\ - GL: quasicrystal --root \n\ - GL: unknownpleasures --root --no-ortho \n\ - binaryring --root \n\ - GL: cityflow --root \n\ - GL: geodesicgears --root \n\ - GL: projectiveplane --root \n\ - GL: romanboy --root \n\ - tessellimage --root \n\ - GL: winduprobot --root \n\ - GL: splitflap --root \n\ - GL: cubestack --root \n\ - GL: cubetwist --root \n\ - GL: discoball --root \n\ - GL: dymaxionmap --root \n\ - GL: energystream --root \n\ - GL: hexstrut --root \n\ - GL: hydrostat --root \n\ - GL: raverhoop --root \n\ - GL: splodesic --root \n\ - GL: unicrud --root \n\ - GL: esper --root \n\ - GL: vigilance --root \n\ - GL: crumbler --root \n\ - filmleader --root \n\ - glitchpeg --root \n\ - GL: handsy --root \n\ - GL: maze3d --root \n\ - GL: peepers --root \n\ - GL: razzledazzle --root \n\ - vfeedback --root \n\ - GL: deepstars --root \n\ - GL: gravitywell --root \n\ - GL: beats --root \n\ - GL: covid19 --root \n\ - GL: etruscanvenus --root \n\ - GL: gibson --root \n\ - GL: headroom --root \n\ - GL: sphereeversion --root \n\ - binaryhorizon --root \n\ - marbling --root \n\ - GL: chompytower --root \n\ - GL: hextrail --root \n\ - GL: mapscroller --root \n\ - GL: nakagin --root \n\ - GL: squirtorus --root \n\ - GL: cubocteversion --root \n\ - droste --root \n\ - GL: papercube --root \n\ - GL: skulloop --root \n\ - - -pointerHysteresis: 10 -authWarningSlack: 20 - diff --git a/nix/configurations/tungsten/nixos/audio.nix b/nix/configurations/tungsten/nixos/audio.nix deleted file mode 100644 index eb70df07..00000000 --- a/nix/configurations/tungsten/nixos/audio.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - services.pipewire = { - enable = true; - pulse.enable = true; - jack.enable = true; - }; - - users.users."leana".extraGroups = ["audio"]; -} diff --git a/nix/configurations/tungsten/nixos/battery.nix b/nix/configurations/tungsten/nixos/battery.nix deleted file mode 100644 index 57ca236a..00000000 --- a/nix/configurations/tungsten/nixos/battery.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - systemd.sleep.extraConfig = '' - HibernateDelaySec=1d - ''; - - services.logind = { - powerKey = "hibernate"; - lidSwitch = "suspend-then-hibernate"; - lidSwitchDocked = "ignore"; - }; -} diff --git a/nix/configurations/tungsten/nixos/certs/universite_de_rennes.pem b/nix/configurations/tungsten/nixos/certs/universite_de_rennes.pem deleted file mode 100644 index ac4d2e1f..00000000 --- a/nix/configurations/tungsten/nixos/certs/universite_de_rennes.pem +++ /dev/null @@ -1,97 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb -MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow -GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj -YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL -MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE -BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM -GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua -BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe -3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4 -YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR -rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm -ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU -oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF -MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v -QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t -b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF -AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q -GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz -Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2 -G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi -l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3 -smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7 -MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD -VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE -AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4 -MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5 -MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO -ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI -s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG -vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ -Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb -IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0 -tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E -xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV -icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5 -D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ -WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ -5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG -KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg -EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID -ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG -BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t -L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr -BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA -A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+ -rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+ -/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA -CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F -zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA -vGp4z7h/jnZymQyd/teRCBaho1+V ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIG5TCCBM2gAwIBAgIRANpDvROb0li7TdYcrMTz2+AwDQYJKoZIhvcNAQEMBQAw -gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK -ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD -VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIw -MDIxODAwMDAwMFoXDTMzMDUwMTIzNTk1OVowRDELMAkGA1UEBhMCTkwxGTAXBgNV -BAoTEEdFQU5UIFZlcmVuaWdpbmcxGjAYBgNVBAMTEUdFQU5UIE9WIFJTQSBDQSA0 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApYhi1aEiPsg9ZKRMAw9Q -r8Mthsr6R20VSfFeh7TgwtLQi6RSRLOh4or4EMG/1th8lijv7xnBMVZkTysFiPmT -PiLOfvz+QwO1NwjvgY+Jrs7fSoVA/TQkXzcxu4Tl3WHi+qJmKLJVu/JOuHud6mOp -LWkIbhODSzOxANJ24IGPx9h4OXDyy6/342eE6UPXCtJ8AzeumTG6Dfv5KVx24lCF -TGUzHUB+j+g0lSKg/Sf1OzgCajJV9enmZ/84ydh48wPp6vbWf1H0O3Rd3LhpMSVn -TqFTLKZSbQeLcx/l9DOKZfBCC9ghWxsgTqW9gQ7v3T3aIfSaVC9rnwVxO0VjmDdP -FNbdoxnh0zYwf45nV1QQgpRwZJ93yWedhp4ch1a6Ajwqs+wv4mZzmBSjovtV0mKw -d+CQbSToalEUP4QeJq4Udz5WNmNMI4OYP6cgrnlJ50aa0DZPlJqrKQPGL69KQQz1 -2WgxvhCuVU70y6ZWAPopBa1ykbsttpLxADZre5cH573lIuLHdjx7NjpYIXRx2+QJ -URnX2qx37eZIxYXz8ggM+wXH6RDbU3V2o5DP67hXPHSAbA+p0orjAocpk2osxHKo -NSE3LCjNx8WVdxnXvuQ28tKdaK69knfm3bB7xpdfsNNTPH9ElcjscWZxpeZ5Iij8 -lyrCG1z0vSWtSBsgSnUyG/sCAwEAAaOCAYswggGHMB8GA1UdIwQYMBaAFFN5v1qq -K0rPVIDh2JvAnfKyA2bLMB0GA1UdDgQWBBRvHTVJEGwy+lmgnryK6B+VvnF6DDAO -BgNVHQ8BAf8EBAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHSUEFjAUBggr -BgEFBQcDAQYIKwYBBQUHAwIwOAYDVR0gBDEwLzAtBgRVHSAAMCUwIwYIKwYBBQUH -AgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMFAGA1UdHwRJMEcwRaBDoEGGP2h0 -dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9u -QXV0aG9yaXR5LmNybDB2BggrBgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6 -Ly9jcnQudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAl -BggrBgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0B -AQwFAAOCAgEAUtlC3e0xj/1BMfPhdQhUXeLjb0xp8UE28kzWE5xDzGKbfGgnrT2R -lw5gLIx+/cNVrad//+MrpTppMlxq59AsXYZW3xRasrvkjGfNR3vt/1RAl8iI31lG -hIg6dfIX5N4esLkrQeN8HiyHKH6khm4966IkVVtnxz5CgUPqEYn4eQ+4eeESrWBh -AqXaiv7HRvpsdwLYekAhnrlGpioZ/CJIT2PTTxf+GHM6cuUnNqdUzfvrQgA8kt1/ -ASXx2od/M+c8nlJqrGz29lrJveJOSEMX0c/ts02WhsfMhkYa6XujUZLmvR1Eq08r -48/EZ4l+t5L4wt0DV8VaPbsEBF1EOFpz/YS2H6mSwcFaNJbnYqqJHIvm3PLJHkFm -EoLXRVrQXdCT+3wgBfgU6heCV5CYBz/YkrdWES7tiiT8sVUDqXmVlTsbiRNiyLs2 -bmEWWFUl76jViIJog5fongEqN3jLIGTG/mXrJT1UyymIcobnIGrbwwRVz/mpFQo0 -vBYIi1k2ThVh0Dx88BbF9YiP84dd8Fkn5wbE6FxXYJ287qfRTgmhePecPc73Yrzt -apdRcsKVGkOpaTIJP/l+lAHRLZxk/dUtyN95G++bOSQqnOCpVPabUGl2E/OEyFrp -Ipwgu2L/WJclvd6g+ZA/iWkLSMcpnFb+uX6QBqvD6+RNxul1FaB5iHY= ------END CERTIFICATE----- - diff --git a/nix/configurations/tungsten/nixos/connectivity.nix b/nix/configurations/tungsten/nixos/connectivity.nix deleted file mode 100644 index 9030f748..00000000 --- a/nix/configurations/tungsten/nixos/connectivity.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: { - # iOS - services.usbmuxd.enable = true; - environment.systemPackages = [pkgs.libimobiledevice]; - - users.users.root.openssh.authorizedKeys.keys = let - ids = import ../../../identities.nix; - in - builtins.concatMap builtins.attrValues (builtins.attrValues ids); - - networking = { - networkmanager.enable = lib.mkForce false; - - firewall.allowedTCPPorts = [8080]; - - wireless = { - enable = true; - userControlled.enable = true; - secretsFile = config.age.secrets.wpa_password.path; - networks = let - ordered = nss: - lib.pipe nss [ - lib.lists.reverseList - (lib.lists.imap0 (i: lib.mapAttrs (_: n: n // {priority = i;}))) - lib.mergeAttrsList - ]; - in - ordered [ - # first in list is tried first - { - "HiddenParadize@Earth2077".pskRaw = "ext:HOME"; - "Pei’s Wifi".pskRaw = "ext:PEI"; - } - { - "_SNCF_WIFI_INOUI" = {}; - "EurostarTrainsWiFi" = {}; - } - { - eduroam = { - authProtocols = ["WPA-EAP"]; - auth = '' - pairwise=CCMP - group=CCMP TKIP - eap=PEAP - ca_cert="${./certs/universite_de_rennes.pem}" - identity="ychiang@etudiant.univ-rennes.fr" - altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr" - phase2="auth=MSCHAPV2" - password=ext:EDUROAM - anonymous_identity="anonymous@univ-rennes.fr" - ''; - }; - } - {"iPhone de Léana 江".pskRaw = "ext:PHONE";} - ]; - }; - }; - - hardware.bluetooth.enable = true; -} diff --git a/nix/configurations/tungsten/nixos/display.nix b/nix/configurations/tungsten/nixos/display.nix deleted file mode 100644 index 8bc7abff..00000000 --- a/nix/configurations/tungsten/nixos/display.nix +++ /dev/null @@ -1,121 +0,0 @@ -{pkgs, ...}: { - imports = [ - # - # builtin screen - # - { - users.users."leana".extraGroups = ["video"]; - programs.light.enable = true; - } - - # # - # # external screen - # # - # { - # users.users."leana".extraGroups = ["i2c"]; - # hardware.i2c.enable = false; - # environment.systemPackages = [pkgs.ddcutil]; - # } - ]; - - # - # Auto setup external screen - # - services.autorandr = { - enable = false; - hooks.postswitch = { - "20_xmonad" = "xmonad --restart"; # make sure feh keeps up - }; - - profiles = let - lg-monitor = "00ffffffffffff001e6d0677dd6a0100041f0103803c2278ea3e31ae5047ac270c50542108007140818081c0a9c0d1c0810001010101b8ce0050f0705a8018108a0058542100001e04740030f2705a80b0588a0058542100001a000000fd00383d1e873c000a202020202020000000fc004c472048445220344b0a20202001bf02033b714d9022201f1203040161605d5e5f230907076d030c001000983c20006001020367d85dc401788001e30f0003e305c000e6060501605550023a801871382d40582c450058542100001e565e00a0a0a029503020350058542100001a000000ff003130344e544b4632513839330a0000000000000000000000000000ff"; - built-in = "00ffffffffffff0009e5ca0b000000002f200104a51c137803de50a3544c99260f505400000001010101010101010101010101010101115cd01881e02d50302036001dbe1000001aa749d01881e02d50302036001dbe1000001a000000fe00424f452043510a202020202020000000fe004e4531333546424d2d4e34310a0073"; - - allOff = { - eDP-1.enable = false; - DP-1.enable = false; - DP-2.enable = false; - DP-3.enable = false; - DP-4.enable = false; - DP-5.enable = false; - DP-6.enable = false; - DP-7.enable = false; - DP-8.enable = false; - DP-9.enable = false; - DP-10.enable = false; - DP-11.enable = false; - DP-12.enable = false; - }; - - home-switch = { - "10_xrdb-dpi" = "xrdb -merge ${pkgs.writeText "xrdb-dpi-config" '' - Xcursor.size: 84 - Xft.dpi: 150 - ''}"; - - "30_xkbcapswap" = '' - setxkbmap -option - ''; - }; - - laptop-switch = { - "10_xrdb-dpi" = "xrdb -merge ${pkgs.writeText "xrdb-dpi-config" '' - Xcursor.size: 64 - Xft.dpi: 150 - ''}"; - - "30_xkbcapswap" = '' - setxkbmap -option caps:swapescape - ''; - }; - - mkHomeProfile = dev: { - fingerprint = { - ${dev} = lg-monitor; - eDP-1 = built-in; - }; - config = - allOff - // { - ${dev} = { - enable = true; - crtc = 1; - mode = "3840x2160"; - rate = "60.00"; - primary = true; - }; - }; - hooks.postswitch = home-switch; - }; - in { - home-DP-1 = mkHomeProfile "DP-1"; - home-DP-2 = mkHomeProfile "DP-2"; - home-DP-3 = mkHomeProfile "DP-3"; - home-DP-4 = mkHomeProfile "DP-4"; - home-DP-5 = mkHomeProfile "DP-5"; - home-DP-6 = mkHomeProfile "DP-6"; - home-DP-7 = mkHomeProfile "DP-7"; - home-DP-8 = mkHomeProfile "DP-8"; - home-DP-9 = mkHomeProfile "DP-9"; - home-DP-10 = mkHomeProfile "DP-10"; - home-DP-11 = mkHomeProfile "DP-11"; - home-DP-12 = mkHomeProfile "DP-12"; - - laptop = { - fingerprint.eDP-1 = built-in; - config = - allOff - // { - eDP-1 = { - enable = true; - crtc = 0; - mode = "2256x1504"; - primary = true; - rate = "60.00"; - }; - }; - hooks.postswitch = laptop-switch; - }; - }; - }; -} diff --git a/nix/configurations/tungsten/nixos/fs.nix b/nix/configurations/tungsten/nixos/fs.nix deleted file mode 100644 index 26f06b5e..00000000 --- a/nix/configurations/tungsten/nixos/fs.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - config, - pkgs, - ... -}: { - systemd.tmpfiles.rules = [ - # tmux-sessionizer directories - "d /home/leana/r 0700 leana leana - -" - "d /home/leana/pg 0700 leana leana 4w -" - "d /home/leana/wt 0700 leana leana - -" - ]; - - fileSystems = { - /* - WARNING: - Use "noauto" if you want to mount the drive at a later time and not all the time - Otherwise the mount would fail and cascade into the graphical session being stopped - */ - - "/home/leana/mnt/tdk32" = { - device = "/dev/disk/by-uuid/EF28-13EC"; - fsType = "vfat"; - options = [ - "umask=0000" - "noauto" - "user" - ]; - }; - - "/home/leana/mnt/EOF_DIGITAL" = { - device = "/dev/disk/by-uuid/0E07-0937"; - fsType = "vfat"; - options = [ - "umask=0000" - "noauto" - "user" - ]; - }; - }; - - environment.etc."crypttab".text = '' - four /dev/disk/by-uuid/f68b6704-670a-4050-b032-2d553070139a ${config.age.secrets.four_pwd.path} noauto - two /dev/disk/by-uuid/552234e0-0820-44d8-b7ac-2653076149a5 ${config.age.secrets.two_pwd.path} noauto - sgbk /dev/disk/by-uuid/21b5207e-c3cf-49da-b944-fb405ae1eee2 ${config.age.secrets.sgbk_pwd.path} noauto - ''; - - systemd.mounts = let - bindToCryptDev = dev: { - what = "/dev/mapper/${dev}"; - where = "/mnt/${dev}"; - unitConfig = { - Requires = ["systemd-cryptsetup@${dev}.service"]; - After = ["systemd-cryptsetup@${dev}.service"]; - PropagatesStopTo = ["systemd-cryptsetup@${dev}.service"]; - }; - }; - in [ - (bindToCryptDev "four") - (bindToCryptDev "two") - (bindToCryptDev "sgbk") - ]; - - environment.systemPackages = [ - pkgs.lsof - pkgs.smartmontools - ]; -} diff --git a/nix/configurations/tungsten/nixos/gui.nix b/nix/configurations/tungsten/nixos/gui.nix deleted file mode 100644 index da00a899..00000000 --- a/nix/configurations/tungsten/nixos/gui.nix +++ /dev/null @@ -1,55 +0,0 @@ -{pkgs, ...}: { - services.xserver.windowManager.xmonad = { - enable = true; - enableContribAndExtras = true; - }; - - services.xserver = { - enable = true; - autoRepeatDelay = 300; - autoRepeatInterval = 40; - }; - - services.xserver.displayManager.lightdm = { - enable = true; - background = "#000000"; - greeters.gtk.cursorTheme = { - name = "volantes_cursors"; - package = pkgs.volantes-cursors; - size = 64; - }; - }; - - services.xscreensaver.enable = true; - - services.picom = { - enable = true; - backend = "glx"; - vSync = true; - fade = true; - fadeDelta = 3; - settings = { - fade-exclude = [ - "name = 'Fcitx5 Input Window'" - "class_g = 'fcitx'" - "class_i = 'fcitx'" - ]; - blur = { - method = "dual_kawase"; - strength = 5; - }; - wintypes = { - dropdown_menu = { - opacity = 1; - blur-background = false; - }; - popup_menu = { - opacity = 1; - blur-background = false; - }; - }; - }; - }; - - services.speechd.enable = false; -} diff --git a/nix/configurations/tungsten/nixos/hardware-configuration.nix b/nix/configurations/tungsten/nixos/hardware-configuration.nix deleted file mode 100644 index 21a64d5d..00000000 --- a/nix/configurations/tungsten/nixos/hardware-configuration.nix +++ /dev/null @@ -1,29 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = ["dm-snapshot"]; - boot.kernelModules = ["kvm-intel" "wl"]; - boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s20u2c2.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/nix/configurations/tungsten/nixos/input.nix b/nix/configurations/tungsten/nixos/input.nix deleted file mode 100644 index 01153159..00000000 --- a/nix/configurations/tungsten/nixos/input.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - hardware.keyboard.zsa.enable = true; - - services.libinput = { - mouse = { - naturalScrolling = true; - accelSpeed = "-0.5"; - }; - touchpad = { - naturalScrolling = true; - tapping = false; - clickMethod = "clickfinger"; - }; - }; - - users.users.leana.extraGroups = ["scanner"]; - - services.fprintd.enable = false; - - # programs.weylus = { - # enable = true; - # users = ["leana"]; - # openFirewall = true; - # }; -} diff --git a/nix/configurations/tungsten/nixos/locale.nix b/nix/configurations/tungsten/nixos/locale.nix deleted file mode 100644 index 6ab2e643..00000000 --- a/nix/configurations/tungsten/nixos/locale.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - time.timeZone = "Europe/Paris"; - - i18n = { - defaultLocale = "en_US.UTF-8"; - supportedLocales = [ - "en_US.UTF-8/UTF-8" - "fr_FR.UTF-8/UTF-8" - "zh_TW.UTF-8/UTF-8" - ]; - }; -} diff --git a/nix/configurations/tungsten/nixos/misc.nix b/nix/configurations/tungsten/nixos/misc.nix deleted file mode 100644 index aa175cd6..00000000 --- a/nix/configurations/tungsten/nixos/misc.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - system.stateVersion = "24.05"; - - boot.loader = { - systemd-boot = { - enable = true; - editor = false; - }; - efi.canTouchEfiVariables = true; - }; -} diff --git a/nix/configurations/tungsten/nixos/programs.nix b/nix/configurations/tungsten/nixos/programs.nix deleted file mode 100644 index 8175edba..00000000 --- a/nix/configurations/tungsten/nixos/programs.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - config, - ... -}: { - imports = [ - # - # Programs - # - { - programs = { - vim.enable = true; - vim.defaultEditor = true; - - git.enable = true; - - dconf.enable = true; - seahorse.enable = true; - - # steam.enable = true; - }; - - services.gnome.gnome-keyring.enable = true; - - services = { - # postgresql = { - # enable = true; - # authentication = lib.mkOverride 10 '' - # local all all trust - # host all all 127.0.0.1/32 trust - # host all all ::1/128 trust - # ''; - # }; - - fwupd.enable = true; - - # languagetool.enable = true; - - url-eater = { - enable = true; - filters = '' - category "Spotify" { - params "context@open.spotify.com" "si@open.spotify.com" - } - category "YouTube" { - params "si@youtu.be" - } - category "Instagram" { - params "utm_source@www.instagram.com" - } - ''; - }; - }; - } - - # - # Virtualization - # - # { - # virtualisation.docker.enable = true; - # users.users."leana".extraGroups = ["docker"]; - # } - # { - # virtualisation.virtualbox.host.enable = true; - # # https://discourse.nixos.org/t/issue-with-virtualbox-in-24-11/57607/2 - # boot.kernelParams = - # lib.mkIf (config.boot.kernelPackages.kernel.kernelAtLeast "6.12") - # (builtins.trace "Note: a KVM kernel flag is added for virtualbox, remember to check if this is patched in upstream" ["kvm.enable_virt_at_load=0"]); - # users.users."leana".extraGroups = ["vboxusers"]; - # } - ]; -} diff --git a/nix/configurations/tungsten/nixos/restic.nix b/nix/configurations/tungsten/nixos/restic.nix deleted file mode 100644 index 64d65493..00000000 --- a/nix/configurations/tungsten/nixos/restic.nix +++ /dev/null @@ -1,100 +0,0 @@ -{config, ...}: { - services.restic.backups = let - pruneOpts = [ - "--keep-daily 7" - "--keep-weekly 4" - "--keep-monthly 12" - "--keep-yearly 10" - ]; - in { - "backblaze" = { - paths = [ - "/home/leana/Documents" - "/home/leana/Calibre" - ]; - - passwordFile = config.age.secrets.restic_backblaze_pwd.path; - repositoryFile = config.age.secrets.restic_backblaze_repo.path; - environmentFile = config.age.secrets.restic_backblaze_env.path; - - inherit pruneOpts; - }; - - "four" = { - paths = [ - "/home/leana/Music" - "/home/leana/Documents" - "/home/leana/Calibre" - "/home/leana/Images" - ]; - - repository = "/mnt/four/restic"; - passwordFile = config.age.secrets.restic_four_pwd.path; - - timerConfig = null; - - inherit pruneOpts; - }; - - "sgbk" = { - paths = [ - "/home/leana/Music" - "/home/leana/Documents" - "/home/leana/Calibre" - "/home/leana/Images" - ]; - - timerConfig = null; - - repository = "/mnt/sgbk/restic"; - passwordFile = config.age.secrets.restic_sgbk_pwd.path; - - inherit pruneOpts; - }; - - "two-to-four" = { - paths = ["/mnt/two"]; - - timerConfig = null; - - repository = "/mnt/four/restic"; - passwordFile = config.age.secrets.restic_four_pwd.path; - - exclude = ["lost+found"]; - - inherit pruneOpts; - }; - }; - - systemd.services = { - # TODO: - # Wait for upstream to introduce direct access to unitConfig - # c.f. https://github.com/NixOS/nixpkgs/pull/368234 - "restic-backups-four" = { - requires = ["mnt-four.mount"]; - after = ["mnt-four.mount"]; - unitConfig.PropagatesStopTo = ["mnt-four.mount"]; - }; - - "restic-backups-sgbk" = { - requires = ["mnt-sgbk.mount"]; - after = ["mnt-sgbk.mount"]; - unitConfig.PropagatesStopTo = ["mnt-sgbk.mount"]; - }; - - "restic-backups-two-to-four" = { - requires = [ - "mnt-two.mount" - "mnt-four.mount" - ]; - after = [ - "mnt-two.mount" - "mnt-four.mount" - ]; - unitConfig.PropagatesStopTo = [ - "mnt-two.mount" - "mnt-four.mount" - ]; - }; - }; -} diff --git a/nix/configurations/tungsten/nixos/unfree-predicate.nix b/nix/configurations/tungsten/nixos/unfree-predicate.nix deleted file mode 100644 index 5261d8c3..00000000 --- a/nix/configurations/tungsten/nixos/unfree-predicate.nix +++ /dev/null @@ -1,26 +0,0 @@ -{lib, ...}: { - nixpkgs.config.allowUnfreePredicate = lib.mkDefault ( - pkg: let - name = lib.getName pkg; - in - builtins.elem name [ - # wifi driver - "broadcom-sta" - - "languagetool" - - "vscode" - "code" - - "tampermonkey" - - "aseprite" - ] - || builtins.any (lib.flip lib.hasInfix name) [ - # Scanner - "brscan5" - - "steam" - ] - ); -} diff --git a/nix/identities.nix b/nix/identities.nix index f7b8fbb4..649c1ca8 100644 --- a/nix/identities.nix +++ b/nix/identities.nix @@ -3,9 +3,4 @@ leana = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium"; root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium"; }; - - tungsten = { - leana = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKTWVdXIZZuxw1FbBBaskExFmYfUWR1MboP/GnC1eCo leana@tungsten"; - root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkeH6KvULmx4XxgdbUoL8ZC0rAGTAOlYRWQRP0pKrzx root@tungsten"; - }; } diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix index 339a820f..2c1f0802 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -1,10 +1,9 @@ let ids = import ../identities.nix; - inherit (ids) vanadium tungsten; + inherit (ids) vanadium; all = - builtins.attrValues vanadium - ++ builtins.attrValues tungsten; + builtins.attrValues vanadium; in { "wpa_password.age".publicKeys = all;