commit 851cb6fe385a1631457f21b022634253497a7e78 Author: Christoph Hollizeck Date: Fri Mar 22 14:39:18 2024 +0000 this works diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1003d3b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* !text !filter !merge !diff diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..b323e02 --- /dev/null +++ b/flake.lock @@ -0,0 +1,267 @@ +{ + "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1657226504, + "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "type": "github" + } + }, + "flake-utils-plus_2": { + "inputs": { + "flake-utils": "flake-utils_2" + }, + "locked": { + "lastModified": 1696331477, + "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1710951922, + "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f091af045dff8347d66d186a62d42aceff159456", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "snowfall-flake": "snowfall-flake", + "snowfall-lib": "snowfall-lib_2", + "unstable": "unstable" + } + }, + "snowfall-flake": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "unstable" + ], + "snowfall-lib": "snowfall-lib" + }, + "locked": { + "lastModified": 1709228099, + "narHash": "sha256-5CCeUQbIPasl9WIiqZHucHCsf9uFl3VZ7Ay+eNA1GU0=", + "owner": "snowfallorg", + "repo": "flake", + "rev": "3dbad05e44aaee77342e386238c823733fffad20", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "flake", + "type": "github" + } + }, + "snowfall-lib": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils-plus": "flake-utils-plus", + "nixpkgs": [ + "snowfall-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694679207, + "narHash": "sha256-g6lYb6nXMpxYUVRZNRZPZI+L31xWlwF/r/oWZmiSYpo=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "8df9cb69f2ee4199c2879baaafce4e13864496a7", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "lib", + "type": "github" + } + }, + "snowfall-lib_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils-plus": "flake-utils-plus_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696432959, + "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "lib", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "unstable": { + "locked": { + "lastModified": 1711001935, + "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..2f1df83 --- /dev/null +++ b/flake.nix @@ -0,0 +1,38 @@ +{ + description = "My NixOS / nix-darwin / nixos-generators systems"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + + home-manager = { + url = "github:nix-community/home-manager/release-23.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + snowfall-lib = { + url = "github:snowfallorg/lib"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + snowfall-flake = { + url = "github:snowfallorg/flake"; + inputs.nixpkgs.follows = "unstable"; + }; + }; + + outputs = inputs: + inputs.snowfall-lib.mkFlake { + inherit inputs; + src = ./.; + + channels-config = {allowUnfree = true;}; + + outputs-builder = channels: {formatter = channels.nixpkgs.alejandra;}; + + overlays = with inputs; [ + # Use the overlay provided by this flake. + snowfall-flake.overlays."package/flake" + ]; + }; +} diff --git a/homes/x86_64-linux/cholli@workvm/default.nix b/homes/x86_64-linux/cholli@workvm/default.nix new file mode 100644 index 0000000..683845a --- /dev/null +++ b/homes/x86_64-linux/cholli@workvm/default.nix @@ -0,0 +1,21 @@ +{ + lib, + pkgs, + config, + ... +}: +# User information gathered by Snowfall Lib is available. +let + name = config.snowfallorg.user.name; + home = config.snowfallorg.user.home.directory; +in { + home = { + packages = with pkgs; [neovim firefox]; + + sessionVariables = {EDITOR = "nvim";}; + + shellAliases = {vimdiff = "nvim -d";}; + + stateVersion = "23.11"; + }; +} diff --git a/modules/nixos/snowfall/default.nix b/modules/nixos/snowfall/default.nix new file mode 100644 index 0000000..b885ddf --- /dev/null +++ b/modules/nixos/snowfall/default.nix @@ -0,0 +1,15 @@ +{ + lib, + config, + ... +}: let + cfg = config.snowfallorg.example; +in { + options.snowfallorg.example = { + enable = lib.mkEnableOption "Snowfall Example"; + }; + + config = lib.mkIf cfg.enable { + environment.variables = {SNOWFALLORG_EXAMPLE = "enabled";}; + }; +} diff --git a/systems/x86_64-linux/workvm/default.nix b/systems/x86_64-linux/workvm/default.nix new file mode 100644 index 0000000..9f3439f --- /dev/null +++ b/systems/x86_64-linux/workvm/default.nix @@ -0,0 +1,51 @@ +{ + pkgs, + config, + ... +}: { + imports = [./hardware.nix]; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.blacklistedKernelModules = ["hyperv-fb"]; + virtualisation.hypervGuest.videoMode = "1920x1080"; + + users.users.cholli = { + isNormalUser = true; + extraGroups = ["wheel"]; + }; + + environment.systemPackages = with pkgs; [ + neovim + snowfallorg.flake + git + gitAndTools.gh + kitty + fish + vim + vivaldi + + fd + tree + ripgrep + + nixfmt + ]; + + home-manager.useGlobalPkgs = true; + + networking.networkmanager.enable = true; + + services.xserver = { + enable = true; + displayManager.sddm.enable = true; + desktopManager.plasma5.enable = true; + layout = "us"; + xkbVariant = ""; + }; + + # Configure Home-Manager options from NixOS. + snowfallorg.user.cholli.home.config = {}; + + system.stateVersion = "23.11"; +} diff --git a/systems/x86_64-linux/workvm/hardware.nix b/systems/x86_64-linux/workvm/hardware.nix new file mode 100644 index 0000000..e6feba0 --- /dev/null +++ b/systems/x86_64-linux/workvm/hardware.nix @@ -0,0 +1,40 @@ +# 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 = []; + + boot.initrd.availableKernelModules = ["sd_mod" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/c58c66b3-4e0f-4393-8d7b-871d934856e3"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6FC0-C2A2"; + fsType = "vfat"; + }; + + swapDevices = []; + + # 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.eth0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + virtualisation.hypervGuest.enable = true; + virtualisation.hypervGuest.videoMode = "1920x1080"; +}