diff --git a/car.png b/car.png new file mode 100644 index 0000000..1c8f597 Binary files /dev/null and b/car.png differ diff --git a/flake.lock b/flake.lock index d54a393..e5bbbd0 100644 --- a/flake.lock +++ b/flake.lock @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1734279981, - "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -308,11 +308,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1734862405, + "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734126203, - "narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=", + "lastModified": 1735268880, + "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71a6392e367b08525ee710a93af2e80083b5b3e2", + "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", "type": "github" }, "original": { @@ -409,11 +409,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -454,11 +454,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734446876, - "narHash": "sha256-cGZBeTh+9pChvz0phepOzM+NK7QVl0Cp5EPBlh1l5xc=", + "lastModified": 1735378670, + "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b7fd46f6caf984fdfc41281792eac7b7ab8f24", + "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", "type": "github" }, "original": { @@ -516,11 +516,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1734110168, - "narHash": "sha256-Q0eeLYn45ErXlqGQyXmLLHGe1mqnUiK0Y9wZRa1SNFI=", + "lastModified": 1735253599, + "narHash": "sha256-aKLAUkdeMH2N5gMDNiOC7KghRNy1necLtLa9+zUcj1g=", "owner": "danth", "repo": "stylix", - "rev": "a9e3779949925ef22f5a215c5f49cf520dea30b1", + "rev": "963e77a3a4fc2be670d5a9a6cbeb249b8a43808a", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { diff --git a/home-manager/modules/stylix.nix b/home-manager/modules/stylix.nix index cb030f8..99b213b 100644 --- a/home-manager/modules/stylix.nix +++ b/home-manager/modules/stylix.nix @@ -5,9 +5,9 @@ stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/eighties.yaml"; - image = ../../topography.png; + image = ../../car.png; cursor = { package = pkgs.oreo-cursors-plus; diff --git a/home-manager/modules/vscodium.nix b/home-manager/modules/vscodium.nix index 42e2c3a..24e4342 100644 --- a/home-manager/modules/vscodium.nix +++ b/home-manager/modules/vscodium.nix @@ -1,18 +1,39 @@ { pkgs, ... }: { - programs.vscode = { + programs.vscode = + { enable = true; package = pkgs.vscodium; - extensions = with pkgs.vscode-extensions; [ + extensions = with pkgs.vscode-extensions; + [ jnoortheen.nix-ide - ms-dotnettools.vscode-dotnet-runtime - ms-dotnettools.csharp golang.go waderyan.gitblame + llvm-vs-code-extensions.vscode-clangd + ms-vscode.cmake-tools + vadimcn.vscode-lldb + donjayamanne.githistory + samuelcolvin.jinjahtml ]; - userSettings = { + userSettings = + { + "terminal.integrated.defaultProfile.linux" = "null"; + "terminal.integrated.shell.linux" = "/run/current-system/sw/bin/bash"; "files.autoSave" = "on"; "editor.minimap.enabled" = false; + "clangd.fallbackFlags" = [ + "-Wall" + "-Wextra" + "-Wpedantic" + "-Werror" + "-I./includes" + ]; + "editor.rulers" = [ + { + "column" = 80; + "color" = "#ff9900"; + } + ]; }; }; } diff --git a/home-manager/package-groups/video-processing.nix b/home-manager/package-groups/video-processing.nix index dc2e18f..9571a23 100644 --- a/home-manager/package-groups/video-processing.nix +++ b/home-manager/package-groups/video-processing.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { programs.obs-studio = { @@ -10,10 +10,11 @@ ]; }; - home.packages = [ + home.packages = with pkgs; [ - pkgs.jellyfin-ffmpeg - pkgs.libsForQt5.kdenlive + jellyfin-ffmpeg + libsForQt5.kdenlive + gpu-screen-recorder-gtk - ]; + ]; } diff --git a/home-manager/your-packages.nix b/home-manager/your-packages.nix index 77fb4b8..6cb5730 100644 --- a/home-manager/your-packages.nix +++ b/home-manager/your-packages.nix @@ -3,6 +3,7 @@ { home.packages = with pkgs; [ logseq + joplin-desktop alacritty vlc diff --git a/nixos/configuration.nix b/nixos/configuration.nix index aaab2ca..05a00bc 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -26,14 +26,4 @@ services.gvfs.enable = true; services.udisks2.enable = true; - - programs.virt-manager.enable = true; - - users.groups.libvirtd.members = ["ficache"]; - - virtualisation.libvirtd.enable = true; - - virtualisation.spiceUSBRedirection.enable = true; - - } diff --git a/nixos/modules/hardware/nvidia.nix b/nixos/modules/hardware/nvidia.nix index 3f50f52..f144f38 100644 --- a/nixos/modules/hardware/nvidia.nix +++ b/nixos/modules/hardware/nvidia.nix @@ -16,9 +16,11 @@ hardware.nvidia.prime = { - sync.enable = true; - + #sync.enable = true; + #offload.enable = true; + reverseSync.enable = true; + nvidiaBusId = "PCI:1:0:0"; - amdgpuBusId = "PCI:4:2:0"; + amdgpuBusId = "PCI:4:0:0"; }; } diff --git a/nixos/modules/nix-ld.nix b/nixos/modules/nix-ld.nix new file mode 100644 index 0000000..dcce1a1 --- /dev/null +++ b/nixos/modules/nix-ld.nix @@ -0,0 +1,6 @@ +{...}: +{ + programs.nix-ld = { + enable = true; + }; +} \ No newline at end of file diff --git a/nixos/modules/postgresql.nix b/nixos/modules/postgresql.nix new file mode 100644 index 0000000..39a9c06 --- /dev/null +++ b/nixos/modules/postgresql.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: +{ + services.postgresql = { + enable = true; + ensureDatabases = [ "mydatabase" ]; + enableTCPIP = true; + # port = 5432; + authentication = pkgs.lib.mkOverride 10 '' + #... + #type database DBuser origin-address auth-method + local all all trust + # ipv4 + host all all 127.0.0.1/32 trust + # ipv6 + host all all ::1/128 trust + ''; + initialScript = pkgs.writeText "backend-initScript" '' + CREATE ROLE nixcloud WITH LOGIN PASSWORD 'nixcloud' CREATEDB; + CREATE DATABASE nixcloud; + GRANT ALL PRIVILEGES ON DATABASE nixcloud TO nixcloud; + ''; + }; +} \ No newline at end of file diff --git a/nixos/modules/virtualbox.nix b/nixos/modules/virtualbox.nix new file mode 100644 index 0000000..2fb1877 --- /dev/null +++ b/nixos/modules/virtualbox.nix @@ -0,0 +1,9 @@ +{ + programs.virt-manager.enable = true; + + users.groups.libvirtd.members = ["ficache"]; + + virtualisation.libvirtd.enable = true; + + virtualisation.spiceUSBRedirection.enable = true; +} \ No newline at end of file diff --git a/nixos/modules/zerotierone.nix b/nixos/modules/zerotierone.nix index b86586a..00f4a55 100644 --- a/nixos/modules/zerotierone.nix +++ b/nixos/modules/zerotierone.nix @@ -2,7 +2,10 @@ { services.zerotierone = { enable = true; - joinNetworks = [ "41d49af6c287fe2b" ]; + joinNetworks = [ + "41d49af6c287fe2b" + "272f5eae16114dee" + ]; }; } \ No newline at end of file diff --git a/nixos/user_modules.nix b/nixos/user_modules.nix index 0a52969..b363c7e 100644 --- a/nixos/user_modules.nix +++ b/nixos/user_modules.nix @@ -4,6 +4,9 @@ ./modules/pipewire.nix ./modules/auto-cpufreq.nix #./modules/zapret.nix + #./modules/virtualbox.nix + ./modules/postgresql.nix + ./modules/nix-ld.nix ./modules/zerotierone.nix ./modules/hardware/nvidia.nix diff --git a/sunset-dusk.png b/sunset-dusk.png new file mode 100644 index 0000000..1500fbd Binary files /dev/null and b/sunset-dusk.png differ diff --git a/sway-colorfull.png b/sway-colorfull.png new file mode 100644 index 0000000..e52efaf Binary files /dev/null and b/sway-colorfull.png differ diff --git a/topography.png b/topography.png index 1d01cc3..e3ac8fe 100644 Binary files a/topography.png and b/topography.png differ diff --git a/wallpaper3.png b/wallpaper3.png deleted file mode 100644 index a04e524..0000000 Binary files a/wallpaper3.png and /dev/null differ