diff --git a/flake.lock b/flake.lock index 416dee4..bf2dbd5 100644 --- a/flake.lock +++ b/flake.lock @@ -80,45 +80,6 @@ "type": "github" } }, - "doomemacs": { - "flake": false, - "locked": { - "lastModified": 1749895289, - "narHash": "sha256-b1Hl70p4OOWkcTtXRiJ3Ker9gzOjAoZfwNqxlmE1s7g=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "e6c755305358412a71a990fc2cf592c629edde1e", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "type": "github" - } - }, - "emacs-overlay": { - "inputs": { - "nixpkgs": [ - "nix-doom-emacs-unstraightened" - ], - "nixpkgs-stable": [ - "nix-doom-emacs-unstraightened" - ] - }, - "locked": { - "lastModified": 1750753596, - "narHash": "sha256-/XQ4k8fUYrYe+utV0aCSHT9wB0wyw/E2IzwHxYySvGc=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "b13d55077455690a9b4e25e4077012f3ac724e2c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -160,7 +121,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -232,27 +193,6 @@ "type": "github" } }, - "nix-doom-emacs-unstraightened": { - "inputs": { - "doomemacs": "doomemacs", - "emacs-overlay": "emacs-overlay", - "nixpkgs": [], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1750754709, - "narHash": "sha256-NzU+nM97aF0ECj0FYXx55fxbkxC0LnzQxBZS7oweJXA=", - "owner": "marienz", - "repo": "nix-doom-emacs-unstraightened", - "rev": "12f1fb5974ac524a43f8467fdbb54ced5cef7ffd", - "type": "github" - }, - "original": { - "owner": "marienz", - "repo": "nix-doom-emacs-unstraightened", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -288,21 +228,6 @@ "type": "github" } }, - "nix-templates": { - "locked": { - "lastModified": 1750839034, - "narHash": "sha256-8pimAU3boBi8rr8JVHrldIsXzi1OmyAbXqioNc3ENTg=", - "ref": "refs/heads/main", - "rev": "ddf6814856b643f7bdbbd704549d888a96612cd2", - "revCount": 6, - "type": "git", - "url": "https://git.xnia.org/evar/nix-templates" - }, - "original": { - "type": "git", - "url": "https://git.xnia.org/evar/nix-templates" - } - }, "nixos-facter-modules": { "locked": { "lastModified": 1743671943, @@ -419,10 +344,8 @@ "home-manager": "home-manager", "impermanence": "impermanence", "muse-sounds-manager": "muse-sounds-manager", - "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-index-database": "nix-index-database", "nix-std": "nix-std", - "nix-templates": "nix-templates", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", @@ -459,21 +382,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "vscode-server": { "inputs": { "flake-utils": "flake-utils", diff --git a/flake.nix b/flake.nix index 463a8e8..2e06ed7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,15 +1,5 @@ { inputs = { - nix-doom-emacs-unstraightened = { - url = "github:marienz/nix-doom-emacs-unstraightened"; - # Optional, to download less. Neither the module nor the overlay uses this input. - inputs.nixpkgs.follows = ""; - }; - nix-templates = { - url = "git+https://git.xnia.org/evar/nix-templates"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; vscode-server.url = "github:nix-community/nixos-vscode-server"; @@ -38,10 +28,9 @@ }; }; - outputs = - inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - systems = [ "x86_64-linux" ]; + outputs = inputs @ {flake-parts, ...}: + flake-parts.lib.mkFlake {inherit inputs;} { + systems = ["x86_64-linux"]; imports = [ ./systems ./dev-shell diff --git a/home/default.nix b/home/default.nix index cbd37be..d76f4ae 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,23 +1,39 @@ { pkgs, - inputs, ... -}: -{ +}: let + variables = { + # VISUAL = "emacs"; + EDITOR = "nvim"; + }; +in { imports = [ - inputs.nix-templates.homeManagerModules.default - inputs.nix-templates.homeManagerModules.home - inputs.nix-templates.homeManagerModules.dev - - # ./xdg.nix + ./xdg.nix + ./terminal.nix + ./desktop.nix + # ./emacs.nix + ./apps.nix + ./git.nix ./vm.nix ]; + home.sessionVariables = variables; + systemd.user.sessionVariables = variables; + + xdg.enable = true; # TODO: what is this? + + fonts.fontconfig.enable = true; # allows adding fonts from home manager config + home.packages = with pkgs; [ + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-color-emoji + ]; + + # programs.ssh programs.ssh = { enable = true; addKeysToAgent = "1h"; }; - services.ssh-agent.enable = true; programs.yt-dlp.enable = true; diff --git a/nixos/default.nix b/nixos/default.nix index 4943729..db51940 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -33,10 +33,10 @@ ]; # So that I can get to the netgear router - # networking.extraHosts = '' - # 10.0.0.152 routerlogin.net - # 10.0.0.152 www.routerlogin.net - # ''; + networking.extraHosts = '' + 10.0.0.152 routerlogin.net + 10.0.0.152 www.routerlogin.net + ''; services.flatpak.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; diff --git a/nixos/kvmfr.nix b/nixos/kvmfr.nix index aa8b81b..ab0a6da 100644 --- a/nixos/kvmfr.nix +++ b/nixos/kvmfr.nix @@ -119,16 +119,15 @@ in { # So I can build for kernel 6.13 # til https://github.com/gnif/LookingGlass/pull/1154 is merged boot.extraModulePackages = with config.boot.kernelPackages; [ - kvmfr - # (kvmfr.overrideAttrs (old: { - # patches = [ ]; # The patches have already since been merged - # src = pkgs.fetchFromGitHub { - # owner = "zeule"; - # repo = "LookingGlass"; - # rev = "7740692e3000c2019e21b9861585960174dd5ddc"; - # sha256 = "sha256-2ayH8FXOn4Bflf55WvhMWTDMLwvucmofD3POI72bC+Q="; - # }; - # })) + (kvmfr.overrideAttrs (old: { + patches = [ ]; # The patches have already since been merged + src = pkgs.fetchFromGitHub { + owner = "zeule"; + repo = "LookingGlass"; + rev = "7740692e3000c2019e21b9861585960174dd5ddc"; + sha256 = "sha256-2ayH8FXOn4Bflf55WvhMWTDMLwvucmofD3POI72bC+Q="; + }; + })) ]; services.udev.packages = optionals (cfg.devices != [ ]) [ udevPackage ]; diff --git a/nixos/users.nix b/nixos/users.nix index 6ce3029..455111e 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -25,7 +25,6 @@ uid = 1000; isNormalUser = true; extraGroups = [ - "libvirtd" "wheel" "networkmanager" "video" diff --git a/nixos/vm.nix b/nixos/vm.nix index 4ae0697..044bdfb 100644 --- a/nixos/vm.nix +++ b/nixos/vm.nix @@ -82,33 +82,33 @@ in { # the network bridge interface with systemctl start network-addresses-winvm0.service, # and potentially toggle the link state in the vm config # to get this working. would be good to fix it. - # networking.bridges = { - # "winvm0" = { - # interfaces = [ "eth0" ]; - # }; - # }; + networking.bridges = { + "winvm0" = { + interfaces = [ "eth0" ]; + }; + }; - # networking.dhcpcd.denyInterfaces = [ "winvm0" ]; + networking.dhcpcd.denyInterfaces = [ "winvm0" ]; # TODO: the below doesn't actually work, so I just # disable wait-online entirely. # ensure the bridge network doesn't cause us to wait # on boot # systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ]; - # systemd.network.wait-online.anyInterface = true; - # boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ]; + systemd.network.wait-online.anyInterface = true; + boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ]; # These are needed, since I'm not currently trying to # reserve a static IP for the bridge interface - # networking.defaultGateway = { address = "10.0.0.1"; interface = "eth0"; }; - # networking.interfaces.winvm0 = { - # useDHCP = false; - # ipv4 = { - # addresses = [ - # { address = "10.0.5.1"; prefixLength = 32; } - # ]; - # }; - # }; + networking.defaultGateway = { address = "10.0.0.1"; interface = "eth0"; }; + networking.interfaces.winvm0 = { + useDHCP = false; + ipv4 = { + addresses = [ + { address = "10.0.5.1"; prefixLength = 32; } + ]; + }; + }; environment.systemPackages = [ # For sharing filesystems @@ -135,10 +135,7 @@ in { hardware.graphics.enable = true; # needed for display spice opengl virtualisation.libvirtd = { enable = true; - qemu = { - swtpm.enable = true; # for TPM 2.0 support - ovmf.packages = [ pkgs.OVMFFull.fd ]; - }; + qemu.swtpm.enable = true; # for TPM 2.0 support onBoot = "ignore"; # only start autostart vms, not just ones that were running onShutdown = "shutdown"; # always shut down the vm's cleanly diff --git a/win10.xml b/win10.xml index 8927c1f..431bb5e 100644 --- a/win10.xml +++ b/win10.xml @@ -183,13 +183,26 @@
+ + + + + +
+ -
+ + + + + +
+ @@ -242,17 +255,19 @@
+ + + + + +
+ - - - 2 -
- - +