From 149e61ac403c9c8d34e65e0e1b8c4481f2e4be56 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Mon, 11 Mar 2024 19:55:00 +0100 Subject: [PATCH] Up --- flake.lock | 144 +++++++++++++++++++++++++++++++++++-- flake.nix | 11 +-- home/home.nix | 28 +++++++- home/hyprland/default.nix | 102 +++++++++++++++----------- home/nextcloud/default.nix | 6 ++ hosts/default.nix | 4 +- hosts/fonts/default.nix | 9 +++ 7 files changed, 251 insertions(+), 53 deletions(-) create mode 100644 home/nextcloud/default.nix create mode 100644 hosts/fonts/default.nix diff --git a/flake.lock b/flake.lock index 14ce455..5d17100 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,32 @@ { "nodes": { - "devshell": { + "apple-fonts": { "inputs": { "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "ny": "ny", + "sf-arabic": "sf-arabic", + "sf-compact": "sf-compact", + "sf-mono": "sf-mono", + "sf-pro": "sf-pro" + }, + "locked": { + "lastModified": 1705496891, + "narHash": "sha256-lLX87aJ9oUT3u0Iaf60xKIJ2RQNt3v4Ne2cvSWyaS7U=", + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "rev": "e6ffbc887752ba0fe035fbcc8b282555804dd3f6", + "type": "github" + }, + "original": { + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "type": "github" + } + }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -77,6 +101,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -91,9 +133,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -194,6 +236,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1696375444, + "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "81e8f48ebdecf07aab321182011b067aafc78896", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1709961763, "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", @@ -235,10 +293,22 @@ "type": "github" } }, + "ny": { + "flake": false, + "locked": { + "narHash": "sha256-phACDdjI8RX6yD77PSmFcsriagt+2UuySD7+WEzdzGo=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -265,11 +335,60 @@ }, "root": { "inputs": { + "apple-fonts": "apple-fonts", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim" } }, + "sf-arabic": { + "flake": false, + "locked": { + "narHash": "sha256-CPewXMGI78xHsjdRU8ZJIBSYjh5UY6UW21ihE4B+Bkk=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + } + }, + "sf-compact": { + "flake": false, + "locked": { + "narHash": "sha256-nJkPlddKF2dIwj+6jiVvS60hDcGAMasEOWemUwBS2mQ=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + } + }, + "sf-mono": { + "flake": false, + "locked": { + "narHash": "sha256-KT1RXz3NcWPetyxVlgMfh/dsoznpI3lMnplz6V7PCUU=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + } + }, + "sf-pro": { + "flake": false, + "locked": { + "narHash": "sha256-cn8ae2UddF8Pru6i3fSG2Wki5sf1DmWKD2FmKMsoeAA=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -299,6 +418,21 @@ "repo": "default", "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 321c8d0..1ea1a5b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,19 +8,20 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; }; outputs = inputs@{ nixpkgs, home-manager, nixvim, ... }: { nixosConfigurations = { - hadi = nixpkgs.lib.nixosSystem { + hadi = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./nixos/configuration.nix - ./hadi ./hosts + { _module.args = { inherit inputs; }; } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home/home.nix b/home/home.nix index 7466c97..d97f344 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,7 +3,32 @@ home.homeDirectory = "/home/hadi"; home.packages = with pkgs; [ - vscode + swappy + spotify + imv + discord + obsidian + ranger + fd + btop + go + cargo + nodejs + python3 + unzip + blueman + gcc + peaclock + xdg_utils + tldr + qt5ct + libva + wget + ripgrep + + # Backup + vscode + firefox ]; home.stateVersion = "23.11"; @@ -21,5 +46,6 @@ ./git ./shell ./misc + ./nextcloud ]; } diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index d0f1409..22003b3 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,4 +1,4 @@ -{pkgs, ...}:{ +{ pkgs, ... }: { home.packages = with pkgs; [ xdg-desktop-portal-hyprland @@ -17,6 +17,7 @@ wayland-utils wayland-protocols meson + xfce.thunar ]; wayland.windowManager.hyprland = { @@ -28,6 +29,11 @@ "$menu" = "~/scripts/menu.sh"; "$powermenu" = "${pkgs.wlogout}/bin/wlogout"; + exec-once = [ + "swww init" + "swww img /home/hadi/nextcloud/wallpaper/Dim.png" + ]; + monitor = [ "eDP-2,highres,0x0,1" "desc:AOC U34G2G1 0x00000E06,highrr,2560x0,1" @@ -36,58 +42,74 @@ bind = [ "$mod, RETURN, exec, kitty" - "$mod, Q, killactive," - "$mod, E, exec, thunar" - "$mod, T, togglefloating," - "$mod, F, fullscreen" - "$mod, B, exec, firefox" - "$mod, C, exec, kitty --class floating peaclock" - "$mod, L, exec, hyprlock" - "$mod, SPACE, exec, $menu" - "$mod, X, exec, $powermenu" - ]++ ( - builtins.concatLists (builtins.genList (i: - let ws = i + 1; - in [ - "$mod, code:1${toString i}, workspace, ${toString ws}" - "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" - ]) 9)); + "$mod, Q, killactive," + "$mod, E, exec, thunar" + "$mod, T, togglefloating," + "$mod, F, fullscreen" + "$mod, B, exec, qutebrowser" + "$mod, C, exec, kitty --class floating peaclock" + "$mod, L, exec, hyprlock" + "$mod, SPACE, exec, $menu" + "$mod, X, exec, $powermenu" + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + ] ++ (builtins.concatLists (builtins.genList (i: + let ws = i + 1; + in [ + "$mod, code:1${toString i}, workspace, ${toString ws}" + "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" + ]) 9)); + + bindm = [ "$mod, mouse:272, movewindow" "$mod, R, resizewindow" ]; + + bindl = [ + ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle" + ",switch:Lid Switch, exec, hyprlock" + ]; + + bindle = [ + ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + ", XF86MonBrightnessUp, exec, brightnessctl set 10%+" + ", XF86MonBrightnessDown, exec, brightnessctl set 10%-" + ]; env = [ - - "XCURSOR_SIZE,24" - "LIBVA_DRIVER_NAME,nvidia" - "XDG_SESSION_TYPE,wayland" - "__GLX_VENDOR_LIBRARY_NAME,nvidia" - "WLR_NO_HARDWARE_CURSORS,1" - "QT_QPA_PLATFORMTHEME,qt5ct" - "SWWW_TRANSITION,wipe" - "XDG_CURRENT_DESKTOP,Hyprland" - "XDG_SESSION_TYPE,wayland" - "XDG_SESSION_DESKTOP,Hyprland" - "QT_AUTO_SCREEN_SCALE_FACTOR,1" - "QT_QPA_PLATFORM=wayland,xcb" - "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" - "T_QPA_PLATFORMTHEME,qt5ct" - "WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" - "GTK_THEME,Adwaita:dark" - "GTK2_RC_FILES,/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc" - "QT_STYLE_OVERRIDE,Adwaita-Dark" + "XCURSOR_SIZE,24" + "LIBVA_DRIVER_NAME,nvidia" + "XDG_SESSION_TYPE,wayland" + "__GLX_VENDOR_LIBRARY_NAME,nvidia" + "WLR_NO_HARDWARE_CURSORS,1" + "QT_QPA_PLATFORMTHEME,qt5ct" + "SWWW_TRANSITION,wipe" + "XDG_CURRENT_DESKTOP,Hyprland" + "XDG_SESSION_TYPE,wayland" + "XDG_SESSION_DESKTOP,Hyprland" + "QT_AUTO_SCREEN_SCALE_FACTOR,1" + "QT_QPA_PLATFORM=wayland,xcb" + "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" + "T_QPA_PLATFORMTHEME,qt5ct" + "WLR_DRM_DEVICES,/dev/dri/card0:/dev/dri/card1" + "GTK_THEME,Adwaita:dark" + "GTK2_RC_FILES,/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc" + "QT_STYLE_OVERRIDE,Adwaita-Dark" ]; input = { - kb_layout="fr"; + kb_layout = "fr"; kb_options = "caps:escape"; follow_mouse = 1; sensitivity = 0.5; repeat_delay = 300; repeat_rate = 50; - numlock_by_default=true; + numlock_by_default = true; - touchpad ={ + touchpad = { natural_scroll = true; - clickfinger_behavior= true; + clickfinger_behavior = true; }; }; diff --git a/home/nextcloud/default.nix b/home/nextcloud/default.nix new file mode 100644 index 0000000..6d6bc7c --- /dev/null +++ b/home/nextcloud/default.nix @@ -0,0 +1,6 @@ +{ + services.nextcloud-client = { + enable = true; + startInBackground = true; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix index 2c43ae3..887811b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,3 +1,3 @@ -{ - imports = [ ./tuigreet ]; +{inputs, ...}:{ + imports = [ ./tuigreet ./fonts ]; } diff --git a/hosts/fonts/default.nix b/hosts/fonts/default.nix new file mode 100644 index 0000000..c6f6d53 --- /dev/null +++ b/hosts/fonts/default.nix @@ -0,0 +1,9 @@ + { pkgs, inputs, ... }: { + + fonts.packages = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd + inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd + ]; + +}