diff --git a/flake.lock b/flake.lock index 2fce9ae..4debd38 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1687856573, - "narHash": "sha256-rzC+5rRsy92Dhjb1q5e5tDjdhRfL1z4WFWwlcD3a+4Q=", + "lastModified": 1689495092, + "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c08f65ab5105a55eed3fc9003f3e6874b69fe13", + "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1687816264, - "narHash": "sha256-WDX7CpYEanlCPTxlcrACbqyRx9lPgqY/xAgStXG2/js=", + "lastModified": 1689675948, + "narHash": "sha256-JzKdHHmk3qttIxgnjgPlGoh4LtmlOIlGFJ1Ltje+lqY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "62c75883d1b275d2a6e62bf31d59a43f0a404c14", + "rev": "2e323a56716e7ac8f391579857a06d424bbed59b", "type": "github" }, "original": { @@ -65,11 +65,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687502512, - "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=", + "lastModified": 1688500189, + "narHash": "sha256-djYYiY4lzJOlXOnTHytH6BUugrxHDZjuGxTSrU4gt4M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f", + "rev": "78419edadf0fabbe5618643bd850b2f2198ed060", "type": "github" }, "original": { @@ -81,11 +81,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1687681650, - "narHash": "sha256-M2If+gRcfpmaJy/XbfSsRzLlPpoU4nr0NHnKKl50fd8=", + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c9db9710cb23d60570ad4d7ab829c2d34403de3", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1686753331, - "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", + "lastModified": 1689611045, + "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=", "owner": "wlroots", "repo": "wlroots", - "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", + "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", "type": "gitlab" }, "original": { diff --git a/system/global/home.nix b/global/home.nix similarity index 98% rename from system/global/home.nix rename to global/home.nix index 29f81c1..6a22ec2 100644 --- a/system/global/home.nix +++ b/global/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, user, name, lib, ... }: +{ config, pkgs, name, lib, ... }: # https://nix-community.github.io/home-manager/options.html let my-deps = { @@ -19,7 +19,7 @@ let fileman = "${pkgs.pcmanfm}/bin/pcmanfm"; gawk = "${pkgs.gawk}/bin/awk"; }; - lf-sixel = pkgs.callPackage ../../custom/lf-sixel/. { }; + lf-sixel = pkgs.callPackage ../custom/lf-sixel/. { }; in { programs.home-manager.enable = true; @@ -366,6 +366,10 @@ in userSettings = { "vscode-neovim.neovimExecutablePaths.linux" = "/run/current-system/sw/bin/nvim"; "keyboard.dispatch" = "keyCode"; + "terminal.integrated.sendKeybindingsToShell" = true; + "aws.telemetry" = false; + "gitlens.telemetry.enabled" = false; + "redhat.telemetry.enabled" = false; }; }; diff --git a/system/global/system.nix b/global/system.nix similarity index 96% rename from system/global/system.nix rename to global/system.nix index d93158c..e19b746 100644 --- a/system/global/system.nix +++ b/global/system.nix @@ -1,13 +1,17 @@ # https://search.nixos.org/options -{ config, pkgs, ... }: +user: { config, pkgs, ... }: { + home-manager.users.${user}.imports = [ + ./home.nix + ]; + nix.settings = { experimental-features = [ "nix-command" "flakes" ]; }; - nix.settings.trusted-users = [ "root" "tristan" ]; + nix.settings.trusted-users = [ "root" user ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -80,7 +84,7 @@ # services.flatpak.enable = true; xdg.portal.enable = true; - users.users.tristan = { + users.users.${user} = { isNormalUser = true; extraGroups = [ "wheel" "video" "networkmanager" ]; initialPassword = "pass"; diff --git a/hardware/work.nix b/hardware/work.nix index d9b1e0d..7c30bbc 100644 --- a/hardware/work.nix +++ b/hardware/work.nix @@ -1,7 +1,4 @@ -# 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, ... }: +{user}: { config, lib, pkgs, modulesPath, ... }: { imports = @@ -88,5 +85,12 @@ }; roles.laptop.enable = true; + + networking.hostName = "FCS-Tristan-Nixbook"; + + system.stateVersion = "22.11"; # do not change + home-manager.users.${user}.imports = [{ + home.stateVersion = "22.05"; + }]; } diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 60143aa..c544d97 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -70,4 +70,39 @@ hardware.keyboard.zsa.enable = true; + networking.hostName = "zenix"; + + services.openssh.enable = true; + + networking.firewall.checkReversePath = "loose"; + + system.stateVersion = "22.11"; # do not change + + virtualisation = { + podman = { + enable = true; + }; + }; + + home-manager.users.${user}.imports = [{ + home.stateVersion = "22.05"; + + wayland.windowManager.hyprland = { + extraConfig = '' + workspace = DP-1, 1 + workspace = HDMI-A-1, 6 + workspace = 1, monitor:DP-1 + workspace = 2, monitor:DP-1 + workspace = 3, monitor:DP-1 + workspace = 4, monitor:DP-1 + workspace = 5, monitor:DP-1 + workspace = 6, monitor:HDMI-A-1 + workspace = 7, monitor:HDMI-A-1 + workspace = 8, monitor:HDMI-A-1 + workspace = 9, monitor:HDMI-A-1 + workspace = 10,monitor:HDMI-A-1 + ''; + }; + }]; + } diff --git a/lib/home.nix b/lib/home.nix index 8182179..3d03f04 100644 --- a/lib/home.nix +++ b/lib/home.nix @@ -23,19 +23,13 @@ (import ./modules/personal.nix { inherit user; }) (import ./modules/gamer.nix { inherit user; }) (import ./modules/wayland.nix { inherit user; }) + (import ../hardware/${name}.nix { inherit user; }) ./scripts.nix - ../system/global/system.nix - ../system/${name}/system.nix - ../hardware/${name}.nix + (import ../global/system.nix user) ]; windowManager.hyprland = true; - home-manager.users.${user}.imports = [ - ../system/global/home.nix - ../system/${name}/home.nix - ]; - roles.work.enable = work; roles.personal.enable = !work; diff --git a/lib/modules/work.nix b/lib/modules/work.nix index 3ecf0fa..4ca9802 100644 --- a/lib/modules/work.nix +++ b/lib/modules/work.nix @@ -45,6 +45,7 @@ with lib; (pkgs.writeShellScriptBin "codex11" '' NIXOS_OZONE_WL= ${pkgs.vscode}/bin/code $@ '') + remmina ]; gtk.gtk3.bookmarks = [ diff --git a/system/work/home.nix b/system/work/home.nix deleted file mode 100644 index 2a9ed9c..0000000 --- a/system/work/home.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, user, name, lib, ... }: -# https://nix-community.github.io/home-manager/options.html -{ - # don't change - home.stateVersion = "22.05"; -} diff --git a/system/work/system.nix b/system/work/system.nix deleted file mode 100644 index 6951b52..0000000 --- a/system/work/system.nix +++ /dev/null @@ -1,45 +0,0 @@ -# https://search.nixos.org/options - -{ config, pkgs, lib, ... }: -{ - - networking.hostName = "FCS-Tristan-Nixbook"; - - system.stateVersion = "22.11"; # do not change - - security.pki.certificates = [ - # mkcert root CA - '' - -----BEGIN CERTIFICATE----- - MIIEtTCCAx2gAwIBAgIQJFzbDr6Qu0RdwlB9iBsKjjANBgkqhkiG9w0BAQsFADBz - MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExJDAiBgNVBAsMG3RyaXN0 - YW5ARkNTLVRyaXN0YW4tTml4Ym9vazErMCkGA1UEAwwibWtjZXJ0IHRyaXN0YW5A - RkNTLVRyaXN0YW4tTml4Ym9vazAeFw0yMzA0MjcwOTA5MDBaFw0zMzA0MjcwOTA5 - MDBaMHMxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTEkMCIGA1UECwwb - dHJpc3RhbkBGQ1MtVHJpc3Rhbi1OaXhib29rMSswKQYDVQQDDCJta2NlcnQgdHJp - c3RhbkBGQ1MtVHJpc3Rhbi1OaXhib29rMIIBojANBgkqhkiG9w0BAQEFAAOCAY8A - MIIBigKCAYEA0rfztOVR6WnW/y/eSjVYPg9Hukegmj4JiPyYWWGwDU2WDFnZNL3h - g66YIngid/1tK/xau793oL5tSlxASCi/8v+UCu946p71iVnEM6GiI5bmLA2yV6DB - gbb6OQ5WCLfoOwOHW5jchlXpFstMsTGAyck3D8n0ndebQQc6YbOQG4RFyTftwI3g - 2oy8Vl8NKyRL2V3NIPx16OkmLDhzo0bKHQAvPc+QUYfKRRn7UlUyfTy/ILwa0ezt - 5KcggU/OMT68eFSp3LItUhRu1zSygCDk2zhJq8ieb5BypvSBWj/mSZtucpoasl72 - txiRCN7yrGw21Z34KdqVF+mI0bWVEZESu1/93HzsEcy9SUX/tF11t/Zb5WAF3kFH - dk0UMRTayhKZuxCRmGIqjLrItUli2tDy+QTzNU0XZAaUokqk3to5GoXSij9H0MdJ - VRA8Y2Mdp+l16MMgLMG5gR9KVnCyM1bkqFJpR+xt8xyeAljI9hFVTyI4i36nUWoi - ITdpBUkaOSoVAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAG - AQH/AgEAMB0GA1UdDgQWBBQnpJfEOuRFXN0YJwf3R2EiWtApHDANBgkqhkiG9w0B - AQsFAAOCAYEAQx3kukopMjvybhbKsx/aU7CynjRCIbbONE10dX9fw7AtjQRB8Vcm - hlsW13MmM6DxroY6taWD8KLZxRNJeHoWdjN689sAbIlnaLrry7XDx5wtsBGfZh3j - vtFzSqHumxa1LjEQPUetTFp6YNgqDDyB53pU/Xfahwda8PCEOEqAsEveYyPqu0I1 - MxNdPa/exE2HJxXZarWQ4pcqReykIVale+WbdOmSaT9cnA+E82hshhq3X6Aeti5s - DmIzY//L1LuNs0bXD4ECyMHA8Pgu3JyhnCIu8cxAKyOnM63P9iKZq5c9NASbvGgT - DNlxgyFqDQEI5k8Q2INM/6ZlJKcKRlIh1Nxd2PXl68IA0dWftBGydCGPPPcSdGCy - vA3XfPrgbuqdJjuPjQggMyajJsg2Y7b9YBL7XIBcwKqnSCxoDORGRQEy47sTaT8a - /BqBUuDPQbCF8MZcbsfwQP4pj8E/YyiSQCSZwQVpwVbZNBSOvcq28h0TEzDnAoHG - ey1rgb0TA5zi - -----END CERTIFICATE----- - '' - ]; - -} - diff --git a/system/zenix/home.nix b/system/zenix/home.nix deleted file mode 100644 index 5d61c65..0000000 --- a/system/zenix/home.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, pkgs, user, name, lib, ... }: -# https://nix-community.github.io/home-manager/options.html -{ - # don't change - home.stateVersion = "22.05"; - - wayland.windowManager.hyprland = { - extraConfig = '' - workspace = DP-1, 1 - workspace = HDMI-A-1, 6 - workspace = 1, monitor:DP-1 - workspace = 2, monitor:DP-1 - workspace = 3, monitor:DP-1 - workspace = 4, monitor:DP-1 - workspace = 5, monitor:DP-1 - workspace = 6, monitor:HDMI-A-1 - workspace = 7, monitor:HDMI-A-1 - workspace = 8, monitor:HDMI-A-1 - workspace = 9, monitor:HDMI-A-1 - workspace = 10,monitor:HDMI-A-1 - ''; - }; -} diff --git a/system/zenix/system.nix b/system/zenix/system.nix deleted file mode 100644 index 07fd7f4..0000000 --- a/system/zenix/system.nix +++ /dev/null @@ -1,21 +0,0 @@ -# https://search.nixos.org/options - -{ config, pkgs, lib, ... }: -{ - - networking.hostName = "zenix"; - - services.openssh.enable = true; - - networking.firewall.checkReversePath = "loose"; - - system.stateVersion = "22.11"; # do not change - - virtualisation = { - podman = { - enable = true; - }; - }; - -} -